| Index: ui/app_list/test/run_all_unittests.cc
|
| diff --git a/ui/app_list/test/run_all_unittests.cc b/ui/app_list/test/run_all_unittests.cc
|
| index 5da865b6c1d3a55ba27332faad2272c45cf9b4ee..07d09cb5aabca68f80bbdb361fa2c75b39bda05c 100644
|
| --- a/ui/app_list/test/run_all_unittests.cc
|
| +++ b/ui/app_list/test/run_all_unittests.cc
|
| @@ -7,7 +7,7 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/path_service.h"
|
| #include "base/test/launcher/unit_test_launcher.h"
|
| -#include "base/test/test_discardable_memory_shmem_allocator.h"
|
| +#include "base/test/test_discardable_memory_allocator.h"
|
| #include "base/test/test_suite.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| @@ -42,7 +42,7 @@ class AppListTestSuite : public base::TestSuite {
|
| ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
|
| ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
|
|
|
| - base::DiscardableMemoryShmemAllocator::SetInstance(
|
| + base::DiscardableMemoryAllocator::SetInstance(
|
| &discardable_memory_allocator_);
|
| }
|
|
|
| @@ -52,7 +52,7 @@ class AppListTestSuite : public base::TestSuite {
|
| }
|
|
|
| private:
|
| - base::TestDiscardableMemoryShmemAllocator discardable_memory_allocator_;
|
| + base::TestDiscardableMemoryAllocator discardable_memory_allocator_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AppListTestSuite);
|
| };
|
|
|