| 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 #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/browser/chrome_content_browser_client.h" | |
| 11 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| 12 #include "chrome/test/test_browser_window.h" | 11 #include "chrome/test/test_browser_window.h" |
| 13 #include "chrome/test/testing_browser_process_test.h" | 12 #include "chrome/test/testing_browser_process_test.h" |
| 14 #include "chrome/test/testing_profile.h" | 13 #include "chrome/test/testing_profile.h" |
| 15 #include "content/browser/browser_thread.h" | 14 #include "content/browser/browser_thread.h" |
| 16 #include "content/browser/renderer_host/test_render_view_host.h" | 15 #include "content/browser/renderer_host/test_render_view_host.h" |
| 17 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" |
| 18 | 17 |
| 19 class GURL; | 18 class GURL; |
| 20 class NavigationController; | 19 class NavigationController; |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 // Creates the profile used by this test. The caller owners the return value. | 94 // Creates the profile used by this test. The caller owners the return value. |
| 96 virtual TestingProfile* CreateProfile(); | 95 virtual TestingProfile* CreateProfile(); |
| 97 | 96 |
| 98 private: | 97 private: |
| 99 // We need to create a MessageLoop, otherwise a bunch of things fails. | 98 // We need to create a MessageLoop, otherwise a bunch of things fails. |
| 100 MessageLoopForUI ui_loop_; | 99 MessageLoopForUI ui_loop_; |
| 101 BrowserThread ui_thread_; | 100 BrowserThread ui_thread_; |
| 102 BrowserThread file_thread_; | 101 BrowserThread file_thread_; |
| 103 | 102 |
| 104 scoped_ptr<TestingProfile> profile_; | 103 scoped_ptr<TestingProfile> profile_; |
| 105 chrome::ChromeContentBrowserClient browser_client_; | |
| 106 scoped_ptr<TestBrowserWindow> window_; | 104 scoped_ptr<TestBrowserWindow> window_; |
| 107 scoped_ptr<Browser> browser_; | 105 scoped_ptr<Browser> browser_; |
| 108 | 106 |
| 109 MockRenderProcessHostFactory rph_factory_; | 107 MockRenderProcessHostFactory rph_factory_; |
| 110 TestRenderViewHostFactory rvh_factory_; | 108 TestRenderViewHostFactory rvh_factory_; |
| 111 | 109 |
| 112 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest); | 110 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest); |
| 113 }; | 111 }; |
| 114 | 112 |
| 115 #endif // CHROME_TEST_BROWSER_WITH_TEST_WINDOW_TEST_H_ | 113 #endif // CHROME_TEST_BROWSER_WITH_TEST_WINDOW_TEST_H_ |
| OLD | NEW |