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/chrome_content_browser_client.h" |
11 #include "chrome/browser/tabs/tab_strip_model.h" | 12 #include "chrome/browser/tabs/tab_strip_model.h" |
12 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
13 #include "chrome/browser/ui/browser_navigator.h" | 14 #include "chrome/browser/ui/browser_navigator.h" |
14 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 15 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
15 #include "chrome/common/page_transition_types.h" | 16 #include "chrome/common/page_transition_types.h" |
16 #include "chrome/common/render_messages.h" | 17 #include "chrome/common/render_messages.h" |
17 #include "chrome/test/testing_profile.h" | 18 #include "chrome/test/testing_profile.h" |
18 #include "content/browser/tab_contents/navigation_controller.h" | 19 #include "content/browser/tab_contents/navigation_controller.h" |
19 #include "content/browser/tab_contents/navigation_entry.h" | 20 #include "content/browser/tab_contents/navigation_entry.h" |
20 #include "content/browser/tab_contents/tab_contents.h" | 21 #include "content/browser/tab_contents/tab_contents.h" |
| 22 #include "content/common/content_client.h" |
21 | 23 |
22 BrowserWithTestWindowTest::BrowserWithTestWindowTest() | 24 BrowserWithTestWindowTest::BrowserWithTestWindowTest() |
23 : ui_thread_(BrowserThread::UI, message_loop()), | 25 : ui_thread_(BrowserThread::UI, message_loop()), |
24 file_thread_(BrowserThread::FILE, message_loop()), | 26 file_thread_(BrowserThread::FILE, message_loop()), |
25 rph_factory_(), | 27 rph_factory_(), |
26 rvh_factory_(&rph_factory_) { | 28 rvh_factory_(&rph_factory_) { |
27 #if defined(OS_WIN) | 29 #if defined(OS_WIN) |
28 OleInitialize(NULL); | 30 OleInitialize(NULL); |
29 #endif | 31 #endif |
30 } | 32 } |
31 | 33 |
32 void BrowserWithTestWindowTest::SetUp() { | 34 void BrowserWithTestWindowTest::SetUp() { |
33 TestingBrowserProcessTest::SetUp(); | 35 TestingBrowserProcessTest::SetUp(); |
34 | 36 |
35 // NOTE: I have a feeling we're going to want virtual methods for creating | 37 // NOTE: I have a feeling we're going to want virtual methods for creating |
36 // these, as such they're in SetUp instead of the constructor. | 38 // these, as such they're in SetUp instead of the constructor. |
37 profile_.reset(new TestingProfile()); | 39 profile_.reset(new TestingProfile()); |
| 40 content::GetContentClient()->set_browser_client( |
| 41 new chrome::ChromeContentBrowserClient()); |
38 browser_.reset(new Browser(Browser::TYPE_NORMAL, profile())); | 42 browser_.reset(new Browser(Browser::TYPE_NORMAL, profile())); |
39 window_.reset(new TestBrowserWindow(browser())); | 43 window_.reset(new TestBrowserWindow(browser())); |
40 browser_->set_window(window_.get()); | 44 browser_->set_window(window_.get()); |
41 } | 45 } |
42 | 46 |
43 BrowserWithTestWindowTest::~BrowserWithTestWindowTest() { | 47 BrowserWithTestWindowTest::~BrowserWithTestWindowTest() { |
44 // Make sure we close all tabs, otherwise Browser isn't happy in its | 48 // Make sure we close all tabs, otherwise Browser isn't happy in its |
45 // destructor. | 49 // destructor. |
46 browser()->CloseAllTabs(); | 50 browser()->CloseAllTabs(); |
47 | 51 |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 void BrowserWithTestWindowTest::NavigateAndCommit( | 103 void BrowserWithTestWindowTest::NavigateAndCommit( |
100 NavigationController* controller, | 104 NavigationController* controller, |
101 const GURL& url) { | 105 const GURL& url) { |
102 controller->LoadURL(url, GURL(), PageTransition::LINK); | 106 controller->LoadURL(url, GURL(), PageTransition::LINK); |
103 CommitPendingLoad(controller); | 107 CommitPendingLoad(controller); |
104 } | 108 } |
105 | 109 |
106 void BrowserWithTestWindowTest::NavigateAndCommitActiveTab(const GURL& url) { | 110 void BrowserWithTestWindowTest::NavigateAndCommitActiveTab(const GURL& url) { |
107 NavigateAndCommit(&browser()->GetSelectedTabContents()->controller(), url); | 111 NavigateAndCommit(&browser()->GetSelectedTabContents()->controller(), url); |
108 } | 112 } |
OLD | NEW |