OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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_thread.h" | |
11 #include "chrome/browser/renderer_host/test/test_render_view_host.h" | 10 #include "chrome/browser/renderer_host/test/test_render_view_host.h" |
12 #include "chrome/test/test_browser_window.h" | 11 #include "chrome/test/test_browser_window.h" |
13 #include "testing/gtest/include/gtest/gtest.h" | 12 #include "testing/gtest/include/gtest/gtest.h" |
14 | 13 |
15 class Browser; | 14 class Browser; |
16 class GURL; | 15 class GURL; |
17 class NavigationController; | 16 class NavigationController; |
18 class TestBrowserWindow; | 17 class TestBrowserWindow; |
19 class TestingProfile; | 18 class TestingProfile; |
20 | 19 |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 // given URL with the default parameters and the commits the load with a page | 79 // given URL with the default parameters and the commits the load with a page |
81 // ID one larger than any seen. This emulates what happens on a new | 80 // ID one larger than any seen. This emulates what happens on a new |
82 // navigation. | 81 // navigation. |
83 void NavigateAndCommit(NavigationController* controller, | 82 void NavigateAndCommit(NavigationController* controller, |
84 const GURL& url); | 83 const GURL& url); |
85 | 84 |
86 // Navigates the current tab. This is a wrapper around NavigateAndCommit. | 85 // Navigates the current tab. This is a wrapper around NavigateAndCommit. |
87 void NavigateAndCommitActiveTab(const GURL& url); | 86 void NavigateAndCommitActiveTab(const GURL& url); |
88 | 87 |
89 private: | 88 private: |
90 | |
91 // We need to create a MessageLoop, otherwise a bunch of things fails. | 89 // We need to create a MessageLoop, otherwise a bunch of things fails. |
92 MessageLoopForUI ui_loop_; | 90 MessageLoopForUI ui_loop_; |
93 ChromeThread ui_thread_; | |
94 | 91 |
95 scoped_ptr<TestingProfile> profile_; | 92 scoped_ptr<TestingProfile> profile_; |
96 scoped_ptr<TestBrowserWindow> window_; | 93 scoped_ptr<TestBrowserWindow> window_; |
97 scoped_ptr<Browser> browser_; | 94 scoped_ptr<Browser> browser_; |
98 | 95 |
99 MockRenderProcessHostFactory rph_factory_; | 96 MockRenderProcessHostFactory rph_factory_; |
100 TestRenderViewHostFactory rvh_factory_; | 97 TestRenderViewHostFactory rvh_factory_; |
101 | 98 |
102 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest); | 99 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest); |
103 }; | 100 }; |
104 | 101 |
105 #endif // CHROME_TEST_BROWSER_WITH_TEST_WINDOW_TEST_H_ | 102 #endif // CHROME_TEST_BROWSER_WITH_TEST_WINDOW_TEST_H_ |
OLD | NEW |