diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-05-29 14:40:03 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-05-29 14:40:03 +0100 |
| commit | 90dce4d38c5ff5333bea97d859d4e484e27edf0c (patch) | |
| tree | 9c51c7dd97d24b15befa97a3482c51851e5383a1 /courgette | |
| parent | 1515035f5917d10d363b0888a3615d581ad8b83f (diff) | |
| download | chromium_org-90dce4d38c5ff5333bea97d859d4e484e27edf0c.tar.gz | |
Merge from Chromium at DEPS revision r202854
This commit was generated by merge_to_master.py.
Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
Diffstat (limited to 'courgette')
| -rw-r--r-- | courgette/adjustment_method_unittest.cc | 2 | ||||
| -rw-r--r-- | courgette/base_test_unittest.cc | 2 | ||||
| -rw-r--r-- | courgette/base_test_unittest.h | 2 | ||||
| -rw-r--r-- | courgette/courgette.gyp | 9 | ||||
| -rw-r--r-- | courgette/courgette_minimal_tool.cc | 2 | ||||
| -rw-r--r-- | courgette/disassembler_win32_x86_unittest.cc | 2 |
6 files changed, 12 insertions, 7 deletions
diff --git a/courgette/adjustment_method_unittest.cc b/courgette/adjustment_method_unittest.cc index 8f5395bd64..a51156111c 100644 --- a/courgette/adjustment_method_unittest.cc +++ b/courgette/adjustment_method_unittest.cc @@ -4,8 +4,6 @@ #include <string> -#include "base/path_service.h" -#include "base/file_util.h" #include "base/string_util.h" #include "courgette/assembly_program.h" diff --git a/courgette/base_test_unittest.cc b/courgette/base_test_unittest.cc index a0e7d05a95..9565536ae3 100644 --- a/courgette/base_test_unittest.cc +++ b/courgette/base_test_unittest.cc @@ -4,6 +4,7 @@ #include "courgette/base_test_unittest.h" +#include "base/file_util.h" #include "base/path_service.h" void BaseTest::SetUp() { @@ -27,7 +28,6 @@ std::string BaseTest::FileContents(const char* file_name) const { } std::string BaseTest::FilesContents(std::list<std::string> file_names) const { - std::string result; std::list<std::string>::iterator file_name = file_names.begin(); diff --git a/courgette/base_test_unittest.h b/courgette/base_test_unittest.h index e4ea0ec0b3..7dd74a0516 100644 --- a/courgette/base_test_unittest.h +++ b/courgette/base_test_unittest.h @@ -8,7 +8,7 @@ #include <list> #include <string> -#include "base/file_util.h" +#include "base/files/file_path.h" #include "testing/gtest/include/gtest/gtest.h" class BaseTest : public testing::Test { diff --git a/courgette/courgette.gyp b/courgette/courgette.gyp index 9cf075a19d..1d6c030496 100644 --- a/courgette/courgette.gyp +++ b/courgette/courgette.gyp @@ -111,6 +111,15 @@ '../testing/gtest.gyp:gtest', ], 'conditions': [ + [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { + 'conditions': [ + ['linux_use_tcmalloc==1', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }], + ], + }], [ 'toolkit_uses_gtk == 1', { 'dependencies': [ # Workaround for gyp bug 69. diff --git a/courgette/courgette_minimal_tool.cc b/courgette/courgette_minimal_tool.cc index 2fd32c1789..972eac472b 100644 --- a/courgette/courgette_minimal_tool.cc +++ b/courgette/courgette_minimal_tool.cc @@ -8,8 +8,6 @@ #include <string> -#include "base/file_util.h" - #include "courgette/third_party/bsdiff.h" #include "courgette/courgette.h" #include "courgette/streams.h" diff --git a/courgette/disassembler_win32_x86_unittest.cc b/courgette/disassembler_win32_x86_unittest.cc index c310675b50..116132700e 100644 --- a/courgette/disassembler_win32_x86_unittest.cc +++ b/courgette/disassembler_win32_x86_unittest.cc @@ -4,11 +4,11 @@ #include "courgette/disassembler_win32_x86.h" +#include "base/memory/scoped_ptr.h" #include "courgette/base_test_unittest.h" class DisassemblerWin32X86Test : public BaseTest { public: - void TestExe() const; void TestExe64() const; void TestResourceDll() const; |