| OLD | NEW | 
|---|
| 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_suite.h" | 9 #include "base/test/test_suite.h" | 
| 10 | 10 | 
| 11 #if defined(OS_WIN) | 11 #if defined(OS_WIN) | 
| 12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" | 
| 13 #include "base/win/scoped_com_initializer.h" | 13 #include "base/win/scoped_com_initializer.h" | 
| 14 #endif | 14 #endif | 
| 15 | 15 | 
| 16 namespace ash { | 16 namespace ash { | 
| 17 namespace test { | 17 namespace test { | 
| 18 | 18 | 
| 19 class AuraShellTestSuite : public base::TestSuite { | 19 class AuraShellTestSuite : public base::TestSuite { | 
| 20  public: | 20  public: | 
| 21   AuraShellTestSuite(int argc, char** argv); | 21   AuraShellTestSuite(int argc, char** argv); | 
| 22 | 22 | 
| 23  protected: | 23  protected: | 
| 24   // base::TestSuite: | 24   // base::TestSuite: | 
| 25   virtual void Initialize() OVERRIDE; | 25   virtual void Initialize() override; | 
| 26   virtual void Shutdown() OVERRIDE; | 26   virtual void Shutdown() override; | 
| 27 | 27 | 
| 28  private: | 28  private: | 
| 29 #if defined(OS_WIN) | 29 #if defined(OS_WIN) | 
| 30   scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_; | 30   scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_; | 
| 31 #endif | 31 #endif | 
| 32 }; | 32 }; | 
| 33 | 33 | 
| 34 }  // namespace test | 34 }  // namespace test | 
| 35 }  // namespace ash | 35 }  // namespace ash | 
| 36 | 36 | 
| 37 #endif  // ASH_TEST_TEST_SUITE_H_ | 37 #endif  // ASH_TEST_TEST_SUITE_H_ | 
| OLD | NEW | 
|---|