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

Side by Side Diff: content/browser/site_per_process_browsertest.cc

Issue 1413643002: Separate RenderViewHost from RenderWidgetHost, part 2: public implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 2 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
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 "content/browser/site_per_process_browsertest.h" 5 #include "content/browser/site_per_process_browsertest.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 EXPECT_NE(rph, child->current_frame_host()->GetProcess()); 422 EXPECT_NE(rph, child->current_frame_host()->GetProcess());
423 { 423 {
424 std::set<RenderWidgetHostView*> views_set = 424 std::set<RenderWidgetHostView*> views_set =
425 static_cast<WebContentsImpl*>(shell()->web_contents()) 425 static_cast<WebContentsImpl*>(shell()->web_contents())
426 ->GetRenderWidgetHostViewsInTree(); 426 ->GetRenderWidgetHostViewsInTree();
427 EXPECT_EQ(2U, views_set.size()); 427 EXPECT_EQ(2U, views_set.size());
428 } 428 }
429 EXPECT_EQ(proxy_to_parent, child->render_manager()->GetProxyToParent()); 429 EXPECT_EQ(proxy_to_parent, child->render_manager()->GetProxyToParent());
430 EXPECT_TRUE(proxy_to_parent->cross_process_frame_connector()); 430 EXPECT_TRUE(proxy_to_parent->cross_process_frame_connector());
431 EXPECT_NE( 431 EXPECT_NE(
432 child->current_frame_host()->render_view_host()->GetView(), 432 child->current_frame_host()->render_view_host()->GetWidget()->GetView(),
433 proxy_to_parent->cross_process_frame_connector()->get_view_for_testing()); 433 proxy_to_parent->cross_process_frame_connector()->get_view_for_testing());
434 EXPECT_TRUE(child->current_frame_host()->GetRenderWidgetHost()); 434 EXPECT_TRUE(child->current_frame_host()->GetRenderWidgetHost());
435 435
436 EXPECT_EQ( 436 EXPECT_EQ(
437 " Site A ------------ proxies for C\n" 437 " Site A ------------ proxies for C\n"
438 " |--Site C ------- proxies for A\n" 438 " |--Site C ------- proxies for A\n"
439 " +--Site A ------- proxies for C\n" 439 " +--Site A ------- proxies for C\n"
440 " |--Site A -- proxies for C\n" 440 " |--Site A -- proxies for C\n"
441 " +--Site A -- proxies for C\n" 441 " +--Site A -- proxies for C\n"
442 " +--Site A -- proxies for C\n" 442 " +--Site A -- proxies for C\n"
(...skipping 3066 matching lines...) Expand 10 before | Expand all | Expand 10 after
3509 while (msg_queue.WaitForMessage(&status)) { 3509 while (msg_queue.WaitForMessage(&status)) {
3510 if (status == "\"document-blur\"") 3510 if (status == "\"document-blur\"")
3511 break; 3511 break;
3512 } 3512 }
3513 3513
3514 // The root frame should be focused again. 3514 // The root frame should be focused again.
3515 EXPECT_EQ(root, root->frame_tree()->GetFocusedFrame()); 3515 EXPECT_EQ(root, root->frame_tree()->GetFocusedFrame());
3516 } 3516 }
3517 3517
3518 } // namespace content 3518 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698