| 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 CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ | 5 #ifndef CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ |
| 6 #define CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ | 6 #define CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ |
| 7 | 7 |
| 8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/test/base/test_browser_window.h" | 10 #include "chrome/test/base/test_browser_window.h" |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 // Creates the profile used by this test. The caller owns the return value. | 104 // Creates the profile used by this test. The caller owns the return value. |
| 105 virtual TestingProfile* CreateProfile(); | 105 virtual TestingProfile* CreateProfile(); |
| 106 | 106 |
| 107 private: | 107 private: |
| 108 // We need to create a MessageLoop, otherwise a bunch of things fails. | 108 // We need to create a MessageLoop, otherwise a bunch of things fails. |
| 109 MessageLoopForUI ui_loop_; | 109 MessageLoopForUI ui_loop_; |
| 110 content::TestBrowserThread ui_thread_; | 110 content::TestBrowserThread ui_thread_; |
| 111 content::TestBrowserThread db_thread_; | 111 content::TestBrowserThread db_thread_; |
| 112 content::TestBrowserThread file_thread_; | 112 content::TestBrowserThread file_thread_; |
| 113 content::TestBrowserThread file_user_blocking_thread_; | 113 content::TestBrowserThread file_user_blocking_thread_; |
| 114 content::TestBrowserThread io_thread_; |
| 114 | 115 |
| 115 scoped_ptr<TestingProfile> profile_; | 116 scoped_ptr<TestingProfile> profile_; |
| 116 scoped_ptr<TestBrowserWindow> window_; | 117 scoped_ptr<TestBrowserWindow> window_; |
| 117 scoped_ptr<Browser> browser_; | 118 scoped_ptr<Browser> browser_; |
| 118 | 119 |
| 119 // The existence of this object enables tests via | 120 // The existence of this object enables tests via |
| 120 // RenderViewHostTester. | 121 // RenderViewHostTester. |
| 121 content::RenderViewHostTestEnabler rvh_test_enabler_; | 122 content::RenderViewHostTestEnabler rvh_test_enabler_; |
| 122 | 123 |
| 123 #if defined(USE_AURA) | 124 #if defined(USE_AURA) |
| 124 scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_; | 125 scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_; |
| 125 #endif | 126 #endif |
| 126 | 127 |
| 127 #if defined(OS_WIN) | 128 #if defined(OS_WIN) |
| 128 ui::ScopedOleInitializer ole_initializer_; | 129 ui::ScopedOleInitializer ole_initializer_; |
| 129 #endif | 130 #endif |
| 130 | 131 |
| 131 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest); | 132 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest); |
| 132 }; | 133 }; |
| 133 | 134 |
| 134 #endif // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ | 135 #endif // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ |
| OLD | NEW |