| OLD | NEW |
| 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_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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 void DestroyBrowser(); | 109 void DestroyBrowser(); |
| 110 | 110 |
| 111 // Creates the profile used by this test. The caller owners the return value. | 111 // Creates the profile used by this test. The caller owners the return value. |
| 112 virtual TestingProfile* CreateProfile(); | 112 virtual TestingProfile* CreateProfile(); |
| 113 | 113 |
| 114 private: | 114 private: |
| 115 // We need to create a MessageLoop, otherwise a bunch of things fails. | 115 // We need to create a MessageLoop, otherwise a bunch of things fails. |
| 116 MessageLoopForUI ui_loop_; | 116 MessageLoopForUI ui_loop_; |
| 117 content::TestBrowserThread ui_thread_; | 117 content::TestBrowserThread ui_thread_; |
| 118 content::TestBrowserThread file_thread_; | 118 content::TestBrowserThread file_thread_; |
| 119 content::TestBrowserThread file_user_blocking_thread_; |
| 119 | 120 |
| 120 scoped_ptr<TestingProfile> profile_; | 121 scoped_ptr<TestingProfile> profile_; |
| 121 scoped_ptr<TestBrowserWindow> window_; | 122 scoped_ptr<TestBrowserWindow> window_; |
| 122 scoped_ptr<Browser> browser_; | 123 scoped_ptr<Browser> browser_; |
| 123 | 124 |
| 124 MockRenderProcessHostFactory rph_factory_; | 125 MockRenderProcessHostFactory rph_factory_; |
| 125 TestRenderViewHostFactory rvh_factory_; | 126 TestRenderViewHostFactory rvh_factory_; |
| 126 | 127 |
| 127 #if defined(USE_AURA) | 128 #if defined(USE_AURA) |
| 128 scoped_ptr<aura::test::TestActivationClient> test_activation_client_; | 129 scoped_ptr<aura::test::TestActivationClient> test_activation_client_; |
| 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 |