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

Side by Side Diff: content/browser/renderer_host/render_view_host_browsertest.cc

Issue 135723003: Move DidCommitProvisionalLoad code from RenderView to RenderFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed unit tests and removed WebContents::DidNavigate Created 6 years, 10 months 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 #include "base/path_service.h" 5 #include "base/path_service.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "base/time/time.h" 7 #include "base/time/time.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "content/browser/frame_host/render_frame_host_impl.h" 9 #include "content/browser/frame_host/render_frame_host_impl.h"
10 #include "content/browser/renderer_host/render_view_host_impl.h" 10 #include "content/browser/renderer_host/render_view_host_impl.h"
11 #include "content/browser/web_contents/web_contents_impl.h" 11 #include "content/browser/web_contents/web_contents_impl.h"
12 #include "content/common/view_messages.h" 12 #include "content/common/view_messages.h"
13 #include "content/public/browser/notification_types.h" 13 #include "content/public/browser/notification_types.h"
14 #include "content/public/browser/web_contents_observer.h" 14 #include "content/public/browser/web_contents_observer.h"
15 #include "content/public/common/content_paths.h" 15 #include "content/public/common/content_paths.h"
16 #include "content/public/common/frame_navigate_params.h"
16 #include "content/public/test/browser_test_utils.h" 17 #include "content/public/test/browser_test_utils.h"
17 #include "content/shell/browser/shell.h" 18 #include "content/shell/browser/shell.h"
18 #include "content/test/content_browser_test.h" 19 #include "content/test/content_browser_test.h"
19 #include "content/test/content_browser_test_utils.h" 20 #include "content/test/content_browser_test_utils.h"
20 #include "net/base/host_port_pair.h" 21 #include "net/base/host_port_pair.h"
21 #include "net/base/net_util.h" 22 #include "net/base/net_util.h"
22 #include "net/test/embedded_test_server/embedded_test_server.h" 23 #include "net/test/embedded_test_server/embedded_test_server.h"
23 24
24 namespace content { 25 namespace content {
25 26
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 Shell* new_shell = new_shell_observer.GetShell(); 111 Shell* new_shell = new_shell_observer.GetShell();
111 FrameTreeNode* new_root = static_cast<WebContentsImpl*>( 112 FrameTreeNode* new_root = static_cast<WebContentsImpl*>(
112 new_shell->web_contents())->GetFrameTree()->root(); 113 new_shell->web_contents())->GetFrameTree()->root();
113 114
114 EXPECT_TRUE(new_root->current_frame_host()); 115 EXPECT_TRUE(new_root->current_frame_host());
115 EXPECT_NE(old_root->current_frame_host()->routing_id(), 116 EXPECT_NE(old_root->current_frame_host()->routing_id(),
116 new_root->current_frame_host()->routing_id()); 117 new_root->current_frame_host()->routing_id());
117 } 118 }
118 119
119 } // namespace content 120 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698