diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 23:34:17 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 23:34:17 +0000 |
| commit | e078590661444968a2c49a3e5464413714471dca (patch) | |
| tree | 13a4dbe4dedccc8057361bd86c89e065390247fc /base/base.gyp | |
| parent | d9f76627b14170b95639619089139b6f0493ae8c (diff) | |
| download | chromium_src-e078590661444968a2c49a3e5464413714471dca.zip chromium_src-e078590661444968a2c49a3e5464413714471dca.tar.gz chromium_src-e078590661444968a2c49a3e5464413714471dca.tar.bz2 | |
Move scoped_temp_dir and scoped_native_library back from base/memory to base.
It looks like they got moved accidentally in http://codereview.chromium.org/6714032
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7048007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
| -rw-r--r-- | base/base.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/base.gyp b/base/base.gyp index d10a4f2..60d0a28 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -145,9 +145,7 @@ 'memory/linked_ptr_unittest.cc', 'memory/mru_cache_unittest.cc', 'memory/ref_counted_unittest.cc', - 'memory/scoped_native_library_unittest.cc', 'memory/scoped_ptr_unittest.cc', - 'memory/scoped_temp_dir_unittest.cc', 'memory/scoped_vector_unittest.cc', 'memory/singleton_unittest.cc', 'memory/weak_ptr_unittest.cc', @@ -167,6 +165,8 @@ 'process_util_unittest_mac.h', 'process_util_unittest_mac.mm', 'rand_util_unittest.cc', + 'scoped_native_library_unittest.cc', + 'scoped_temp_dir_unittest.cc', 'sha1_unittest.cc', 'shared_memory_unittest.cc', 'stack_container_unittest.cc', |