Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(261)

Side by Side Diff: ash/test/test_suite.cc

Issue 1009413002: Revert "base: Implement browser process support for discardable memory." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/test/test_suite.h ('k') | base/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/test/test_suite.h" 5 #include "ash/test/test_suite.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 } 45 }
46 #endif 46 #endif
47 47
48 gfx::RegisterPathProvider(); 48 gfx::RegisterPathProvider();
49 ui::RegisterPathProvider(); 49 ui::RegisterPathProvider();
50 50
51 // Force unittests to run using en-US so if we test against string 51 // Force unittests to run using en-US so if we test against string
52 // output, it'll pass regardless of the system language. 52 // output, it'll pass regardless of the system language.
53 ui::ResourceBundle::InitSharedInstanceWithLocale( 53 ui::ResourceBundle::InitSharedInstanceWithLocale(
54 "en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES); 54 "en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
55
56 base::DiscardableMemoryShmemAllocator::SetInstance(
57 &discardable_memory_allocator_);
58 } 55 }
59 56
60 void AuraShellTestSuite::Shutdown() { 57 void AuraShellTestSuite::Shutdown() {
61 ui::ResourceBundle::CleanupSharedInstance(); 58 ui::ResourceBundle::CleanupSharedInstance();
62 #if defined(OS_WIN) 59 #if defined(OS_WIN)
63 com_initializer_.reset(); 60 com_initializer_.reset();
64 #endif 61 #endif
65 base::TestSuite::Shutdown(); 62 base::TestSuite::Shutdown();
66 } 63 }
67 64
68 } // namespace test 65 } // namespace test
69 } // namespace ash 66 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/test_suite.h ('k') | base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698