diff options
| author | reveman <reveman@chromium.org> | 2015-03-17 16:18:16 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-17 23:19:02 +0000 |
| commit | 1af05cb3770b3e3eb61d3731a09efcd1fbec242b (patch) | |
| tree | ca5db72a1069a452a3894373db195dce852784dc /ash | |
| parent | 93fb9e3408ee0b5788ee65b69c864d43f3360d3f (diff) | |
| download | chromium_src-1af05cb3770b3e3eb61d3731a09efcd1fbec242b.zip chromium_src-1af05cb3770b3e3eb61d3731a09efcd1fbec242b.tar.gz chromium_src-1af05cb3770b3e3eb61d3731a09efcd1fbec242b.tar.bz2 | |
base: Rename discardable memory allocator interface and remove unnecessary class.
There's only one discardable memory allocator interface. Rename it
to DiscardableMemoryAllocator. DiscardableMemoryShmemChunk class
is unnecessary, remove it.
BUG=442945,422953
Review URL: https://codereview.chromium.org/1001873002
Cr-Commit-Position: refs/heads/master@{#321008}
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/test/test_suite.cc | 3 | ||||
| -rw-r--r-- | ash/test/test_suite.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ash/test/test_suite.cc b/ash/test/test_suite.cc index 80d61f4..4f1ead0 100644 --- a/ash/test/test_suite.cc +++ b/ash/test/test_suite.cc @@ -53,8 +53,7 @@ void AuraShellTestSuite::Initialize() { ui::ResourceBundle::InitSharedInstanceWithLocale( "en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES); - base::DiscardableMemoryShmemAllocator::SetInstance( - &discardable_memory_allocator_); + base::DiscardableMemoryAllocator::SetInstance(&discardable_memory_allocator_); } void AuraShellTestSuite::Shutdown() { diff --git a/ash/test/test_suite.h b/ash/test/test_suite.h index e2e0957..e740bac 100644 --- a/ash/test/test_suite.h +++ b/ash/test/test_suite.h @@ -6,7 +6,7 @@ #define ASH_TEST_TEST_SUITE_H_ #include "base/compiler_specific.h" -#include "base/test/test_discardable_memory_shmem_allocator.h" +#include "base/test/test_discardable_memory_allocator.h" #include "base/test/test_suite.h" #if defined(OS_WIN) @@ -31,7 +31,7 @@ class AuraShellTestSuite : public base::TestSuite { scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_; #endif - base::TestDiscardableMemoryShmemAllocator discardable_memory_allocator_; + base::TestDiscardableMemoryAllocator discardable_memory_allocator_; }; } // namespace test |