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

Side by Side Diff: chrome/test/base/chrome_test_suite.h

Issue 9664069: Move scoped_ole_initializer.h to ui/base/win and clean up ole initialization/uninitialization. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 CHROME_TEST_BASE_CHROME_TEST_SUITE_H_ 5 #ifndef CHROME_TEST_BASE_CHROME_TEST_SUITE_H_
6 #define CHROME_TEST_BASE_CHROME_TEST_SUITE_H_ 6 #define CHROME_TEST_BASE_CHROME_TEST_SUITE_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/file_path.h" 11 #include "base/file_path.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/test/test_suite.h" 13 #include "base/test/test_suite.h"
14 #include "chrome/app/scoped_ole_initializer.h" 14
15 #if defined(OS_WIN)
16 #include "ui/base/win/scoped_ole_initializer.h"
17 #endif
15 18
16 namespace base { 19 namespace base {
17 class StatsTable; 20 class StatsTable;
18 } 21 }
19 22
20 class ChromeTestSuite : public base::TestSuite { 23 class ChromeTestSuite : public base::TestSuite {
21 public: 24 public:
22 ChromeTestSuite(int argc, char** argv); 25 ChromeTestSuite(int argc, char** argv);
23 virtual ~ChromeTestSuite(); 26 virtual ~ChromeTestSuite();
24 27
25 protected: 28 protected:
26 virtual void Initialize() OVERRIDE; 29 virtual void Initialize() OVERRIDE;
27 virtual void Shutdown() OVERRIDE; 30 virtual void Shutdown() OVERRIDE;
28 31
29 void SetBrowserDirectory(const FilePath& browser_dir) { 32 void SetBrowserDirectory(const FilePath& browser_dir) {
30 browser_dir_ = browser_dir; 33 browser_dir_ = browser_dir;
31 } 34 }
32 35
33 // Alternative path to browser binaries. 36 // Alternative path to browser binaries.
34 FilePath browser_dir_; 37 FilePath browser_dir_;
35 38
36 std::string stats_filename_; 39 std::string stats_filename_;
37 scoped_ptr<base::StatsTable> stats_table_; 40 scoped_ptr<base::StatsTable> stats_table_;
38 41
39 ScopedOleInitializer ole_initializer_; 42 #if defined(OS_WIN)
43 ui::ScopedOleInitializer ole_initializer_;
44 #endif
40 }; 45 };
41 46
42 #endif // CHROME_TEST_BASE_CHROME_TEST_SUITE_H_ 47 #endif // CHROME_TEST_BASE_CHROME_TEST_SUITE_H_
OLDNEW
« no previous file with comments | « chrome/test/base/browser_with_test_window_test.cc ('k') | chrome/test/base/view_event_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698