Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Side by Side Diff: content/public/test/test_renderer_host.h

Issue 26316005: Move out DidStartProvisionalLoad from WebContentsImpl into Navigator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes based on Charlie's latest review. Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 #ifndef CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_ 5 #ifndef CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_
6 #define CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_ 6 #define CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "content/public/browser/render_frame_host.h"
10 #include "content/public/browser/render_view_host.h" 11 #include "content/public/browser/render_view_host.h"
11 #include "content/public/common/page_transition_types.h" 12 #include "content/public/common/page_transition_types.h"
12 #include "content/public/test/test_browser_thread_bundle.h" 13 #include "content/public/test/test_browser_thread_bundle.h"
13 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
14 15
15 #if defined(USE_AURA) 16 #if defined(USE_AURA)
16 #include "ui/aura/test/aura_test_helper.h" 17 #include "ui/aura/test/aura_test_helper.h"
17 #endif 18 #endif
18 19
19 namespace aura { 20 namespace aura {
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 class RenderViewHostTestHarness : public testing::Test { 125 class RenderViewHostTestHarness : public testing::Test {
125 public: 126 public:
126 RenderViewHostTestHarness(); 127 RenderViewHostTestHarness();
127 virtual ~RenderViewHostTestHarness(); 128 virtual ~RenderViewHostTestHarness();
128 129
129 NavigationController& controller(); 130 NavigationController& controller();
130 WebContents* web_contents(); 131 WebContents* web_contents();
131 RenderViewHost* rvh(); 132 RenderViewHost* rvh();
132 RenderViewHost* pending_rvh(); 133 RenderViewHost* pending_rvh();
133 RenderViewHost* active_rvh(); 134 RenderViewHost* active_rvh();
135 RenderFrameHost* main_rfh();
134 BrowserContext* browser_context(); 136 BrowserContext* browser_context();
135 MockRenderProcessHost* process(); 137 MockRenderProcessHost* process();
136 138
137 // Frees the current WebContents for tests that want to test destruction. 139 // Frees the current WebContents for tests that want to test destruction.
138 void DeleteContents(); 140 void DeleteContents();
139 141
140 // Sets the current WebContents for tests that want to alter it. Takes 142 // Sets the current WebContents for tests that want to alter it. Takes
141 // ownership of the WebContents passed. 143 // ownership of the WebContents passed.
142 void SetContents(WebContents* contents); 144 void SetContents(WebContents* contents);
143 145
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 199
198 int thread_bundle_options_; 200 int thread_bundle_options_;
199 scoped_ptr<TestBrowserThreadBundle> thread_bundle_; 201 scoped_ptr<TestBrowserThreadBundle> thread_bundle_;
200 202
201 DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness); 203 DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness);
202 }; 204 };
203 205
204 } // namespace content 206 } // namespace content
205 207
206 #endif // CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_ 208 #endif // CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.cc ('k') | content/public/test/test_renderer_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698