OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 #include "chrome/test/browser_with_test_window_test.h" | 5 #include "chrome/test/browser_with_test_window_test.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <ole2.h> | 8 #include <ole2.h> |
9 #endif // defined(OS_WIN) | 9 #endif // defined(OS_WIN) |
10 | 10 |
11 #include "chrome/browser/tabs/tab_strip_model.h" | 11 #include "chrome/browser/tabs/tab_strip_model.h" |
12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
13 #include "chrome/browser/ui/browser_navigator.h" | 13 #include "chrome/browser/ui/browser_navigator.h" |
14 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 14 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
15 #include "chrome/common/page_transition_types.h" | 15 #include "chrome/common/page_transition_types.h" |
16 #include "chrome/common/render_messages.h" | 16 #include "chrome/common/render_messages.h" |
17 #include "chrome/test/testing_profile.h" | 17 #include "chrome/test/testing_profile.h" |
18 #include "content/browser/tab_contents/navigation_controller.h" | 18 #include "content/browser/tab_contents/navigation_controller.h" |
19 #include "content/browser/tab_contents/navigation_entry.h" | 19 #include "content/browser/tab_contents/navigation_entry.h" |
20 #include "content/browser/tab_contents/tab_contents.h" | 20 #include "content/browser/tab_contents/tab_contents.h" |
21 | 21 |
22 BrowserWithTestWindowTest::BrowserWithTestWindowTest() | 22 BrowserWithTestWindowTest::BrowserWithTestWindowTest() |
23 : ui_thread_(BrowserThread::UI, message_loop()), | 23 : ui_thread_(BrowserThread::UI, message_loop()), |
| 24 file_thread_(BrowserThread::FILE, message_loop()), |
24 rph_factory_(), | 25 rph_factory_(), |
25 rvh_factory_(&rph_factory_) { | 26 rvh_factory_(&rph_factory_) { |
26 #if defined(OS_WIN) | 27 #if defined(OS_WIN) |
27 OleInitialize(NULL); | 28 OleInitialize(NULL); |
28 #endif | 29 #endif |
29 } | 30 } |
30 | 31 |
31 void BrowserWithTestWindowTest::SetUp() { | 32 void BrowserWithTestWindowTest::SetUp() { |
32 TestingBrowserProcessTest::SetUp(); | 33 TestingBrowserProcessTest::SetUp(); |
33 | 34 |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 void BrowserWithTestWindowTest::NavigateAndCommit( | 99 void BrowserWithTestWindowTest::NavigateAndCommit( |
99 NavigationController* controller, | 100 NavigationController* controller, |
100 const GURL& url) { | 101 const GURL& url) { |
101 controller->LoadURL(url, GURL(), PageTransition::LINK); | 102 controller->LoadURL(url, GURL(), PageTransition::LINK); |
102 CommitPendingLoad(controller); | 103 CommitPendingLoad(controller); |
103 } | 104 } |
104 | 105 |
105 void BrowserWithTestWindowTest::NavigateAndCommitActiveTab(const GURL& url) { | 106 void BrowserWithTestWindowTest::NavigateAndCommitActiveTab(const GURL& url) { |
106 NavigateAndCommit(&browser()->GetSelectedTabContents()->controller(), url); | 107 NavigateAndCommit(&browser()->GetSelectedTabContents()->controller(), url); |
107 } | 108 } |
OLD | NEW |