| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 |
| 11 #include "chrome/browser/tabs/tab_strip_model.h" | 11 #include "chrome/browser/tabs/tab_strip_model.h" |
| 12 #include "chrome/browser/ui/browser_navigator.h" | 12 #include "chrome/browser/ui/browser_navigator.h" |
| 13 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 13 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
| 14 #include "chrome/common/render_messages.h" | 14 #include "chrome/common/render_messages.h" |
| 15 #include "chrome/test/base/testing_profile.h" | 15 #include "chrome/test/base/testing_profile.h" |
| 16 #include "content/public/browser/navigation_controller.h" | 16 #include "content/public/browser/navigation_controller.h" |
| 17 #include "content/public/browser/navigation_entry.h" | 17 #include "content/public/browser/navigation_entry.h" |
| 18 #include "content/public/browser/web_contents.h" | 18 #include "content/public/browser/web_contents.h" |
| 19 #include "content/public/common/page_transition_types.h" | 19 #include "content/public/common/page_transition_types.h" |
| 20 | 20 |
| 21 #if defined(USE_AURA) | 21 #if defined(USE_AURA) |
| 22 #include "ui/aura/root_window.h" | 22 #include "ui/aura/root_window.h" |
| 23 #include "ui/aura/test/test_activation_client.h" | 23 #include "ui/aura/test/test_activation_client.h" |
| 24 #include "ui/aura/test/test_stacking_client.h" | 24 #include "ui/aura/test/test_stacking_client.h" |
| 25 #endif | 25 #endif |
| 26 | 26 |
| 27 using content::BrowserThread; | 27 using content::BrowserThread; |
| 28 using content::NavigationController; | 28 using content::NavigationController; |
| 29 using content::TestRenderViewHost; |
| 29 using content::WebContents; | 30 using content::WebContents; |
| 30 | 31 |
| 31 BrowserWithTestWindowTest::BrowserWithTestWindowTest() | 32 BrowserWithTestWindowTest::BrowserWithTestWindowTest() |
| 32 : ui_thread_(BrowserThread::UI, message_loop()), | 33 : ui_thread_(BrowserThread::UI, message_loop()), |
| 33 file_thread_(BrowserThread::FILE, message_loop()), | 34 file_thread_(BrowserThread::FILE, message_loop()), |
| 34 file_user_blocking_thread_( | 35 file_user_blocking_thread_( |
| 35 BrowserThread::FILE_USER_BLOCKING, message_loop()), | 36 BrowserThread::FILE_USER_BLOCKING, message_loop()), |
| 36 rph_factory_(), | 37 rph_factory_(), |
| 37 rvh_factory_(&rph_factory_) { | 38 rvh_factory_(&rph_factory_) { |
| 38 #if defined(OS_WIN) | 39 #if defined(OS_WIN) |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 // Make sure we close all tabs, otherwise Browser isn't happy in its | 154 // Make sure we close all tabs, otherwise Browser isn't happy in its |
| 154 // destructor. | 155 // destructor. |
| 155 browser()->CloseAllTabs(); | 156 browser()->CloseAllTabs(); |
| 156 browser_.reset(NULL); | 157 browser_.reset(NULL); |
| 157 window_.reset(NULL); | 158 window_.reset(NULL); |
| 158 } | 159 } |
| 159 | 160 |
| 160 TestingProfile* BrowserWithTestWindowTest::CreateProfile() { | 161 TestingProfile* BrowserWithTestWindowTest::CreateProfile() { |
| 161 return new TestingProfile(); | 162 return new TestingProfile(); |
| 162 } | 163 } |
| OLD | NEW |