OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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_BROWSER_WITH_TEST_WINDOW_TEST_H_ | 5 #ifndef CHROME_TEST_BROWSER_WITH_TEST_WINDOW_TEST_H_ |
6 #define CHROME_TEST_BROWSER_WITH_TEST_WINDOW_TEST_H_ | 6 #define CHROME_TEST_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/test/testing_browser_process_test.h" | 10 #include "chrome/test/testing_browser_process_test.h" |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 const GURL& url); | 85 const GURL& url); |
86 | 86 |
87 // Navigates the current tab. This is a wrapper around NavigateAndCommit. | 87 // Navigates the current tab. This is a wrapper around NavigateAndCommit. |
88 void NavigateAndCommitActiveTab(const GURL& url); | 88 void NavigateAndCommitActiveTab(const GURL& url); |
89 | 89 |
90 private: | 90 private: |
91 | 91 |
92 // We need to create a MessageLoop, otherwise a bunch of things fails. | 92 // We need to create a MessageLoop, otherwise a bunch of things fails. |
93 MessageLoopForUI ui_loop_; | 93 MessageLoopForUI ui_loop_; |
94 BrowserThread ui_thread_; | 94 BrowserThread ui_thread_; |
| 95 BrowserThread file_thread_; |
95 | 96 |
96 scoped_ptr<TestingProfile> profile_; | 97 scoped_ptr<TestingProfile> profile_; |
97 scoped_ptr<TestBrowserWindow> window_; | 98 scoped_ptr<TestBrowserWindow> window_; |
98 scoped_ptr<Browser> browser_; | 99 scoped_ptr<Browser> browser_; |
99 | 100 |
100 MockRenderProcessHostFactory rph_factory_; | 101 MockRenderProcessHostFactory rph_factory_; |
101 TestRenderViewHostFactory rvh_factory_; | 102 TestRenderViewHostFactory rvh_factory_; |
102 | 103 |
103 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest); | 104 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest); |
104 }; | 105 }; |
105 | 106 |
106 #endif // CHROME_TEST_BROWSER_WITH_TEST_WINDOW_TEST_H_ | 107 #endif // CHROME_TEST_BROWSER_WITH_TEST_WINDOW_TEST_H_ |
OLD | NEW |