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 #include "chrome/test/base/browser_with_test_window_test.h" | 5 #include "chrome/test/base/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 |
(...skipping 11 matching lines...) Expand all Loading... |
22 : ui_thread_(BrowserThread::UI, message_loop()), | 22 : ui_thread_(BrowserThread::UI, message_loop()), |
23 file_thread_(BrowserThread::FILE, message_loop()), | 23 file_thread_(BrowserThread::FILE, message_loop()), |
24 rph_factory_(), | 24 rph_factory_(), |
25 rvh_factory_(&rph_factory_) { | 25 rvh_factory_(&rph_factory_) { |
26 #if defined(OS_WIN) | 26 #if defined(OS_WIN) |
27 OleInitialize(NULL); | 27 OleInitialize(NULL); |
28 #endif | 28 #endif |
29 } | 29 } |
30 | 30 |
31 void BrowserWithTestWindowTest::SetUp() { | 31 void BrowserWithTestWindowTest::SetUp() { |
32 TestingBrowserProcessTest::SetUp(); | 32 testing::Test::SetUp(); |
33 | 33 |
34 profile_.reset(CreateProfile()); | 34 profile_.reset(CreateProfile()); |
35 browser_.reset(new Browser(Browser::TYPE_TABBED, profile())); | 35 browser_.reset(new Browser(Browser::TYPE_TABBED, profile())); |
36 window_.reset(new TestBrowserWindow(browser())); | 36 window_.reset(new TestBrowserWindow(browser())); |
37 browser_->set_window(window_.get()); | 37 browser_->set_window(window_.get()); |
38 } | 38 } |
39 | 39 |
40 BrowserWithTestWindowTest::~BrowserWithTestWindowTest() { | 40 BrowserWithTestWindowTest::~BrowserWithTestWindowTest() { |
41 // A Task is leaked if we don't destroy everything, then run the message | 41 // A Task is leaked if we don't destroy everything, then run the message |
42 // loop. | 42 // loop. |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 // Make sure we close all tabs, otherwise Browser isn't happy in its | 105 // Make sure we close all tabs, otherwise Browser isn't happy in its |
106 // destructor. | 106 // destructor. |
107 browser()->CloseAllTabs(); | 107 browser()->CloseAllTabs(); |
108 browser_.reset(NULL); | 108 browser_.reset(NULL); |
109 window_.reset(NULL); | 109 window_.reset(NULL); |
110 } | 110 } |
111 | 111 |
112 TestingProfile* BrowserWithTestWindowTest::CreateProfile() { | 112 TestingProfile* BrowserWithTestWindowTest::CreateProfile() { |
113 return new TestingProfile(); | 113 return new TestingProfile(); |
114 } | 114 } |
OLD | NEW |