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

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

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 | « no previous file | ash/test/test_suite.cc » ('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 #ifndef ASH_TEST_TEST_SUITE_H_ 5 #ifndef ASH_TEST_TEST_SUITE_H_
6 #define ASH_TEST_TEST_SUITE_H_ 6 #define ASH_TEST_TEST_SUITE_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/test/test_discardable_memory_shmem_allocator.h"
10 #include "base/test/test_suite.h" 9 #include "base/test/test_suite.h"
11 10
12 #if defined(OS_WIN) 11 #if defined(OS_WIN)
13 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
14 #include "base/win/scoped_com_initializer.h" 13 #include "base/win/scoped_com_initializer.h"
15 #endif 14 #endif
16 15
17 namespace ash { 16 namespace ash {
18 namespace test { 17 namespace test {
19 18
20 class AuraShellTestSuite : public base::TestSuite { 19 class AuraShellTestSuite : public base::TestSuite {
21 public: 20 public:
22 AuraShellTestSuite(int argc, char** argv); 21 AuraShellTestSuite(int argc, char** argv);
23 22
24 protected: 23 protected:
25 // base::TestSuite: 24 // base::TestSuite:
26 void Initialize() override; 25 void Initialize() override;
27 void Shutdown() override; 26 void Shutdown() override;
28 27
29 private: 28 private:
30 #if defined(OS_WIN) 29 #if defined(OS_WIN)
31 scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_; 30 scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_;
32 #endif 31 #endif
33
34 base::TestDiscardableMemoryShmemAllocator discardable_memory_allocator_;
35 }; 32 };
36 33
37 } // namespace test 34 } // namespace test
38 } // namespace ash 35 } // namespace ash
39 36
40 #endif // ASH_TEST_TEST_SUITE_H_ 37 #endif // ASH_TEST_TEST_SUITE_H_
OLDNEW
« no previous file with comments | « no previous file | ash/test/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698