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

Unified Diff: components/html_viewer/html_frame_apptest.cc

Issue 1323233004: Adds better security checking to OnCreatedFrame() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/web_view/frame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/html_viewer/html_frame_apptest.cc
diff --git a/components/html_viewer/html_frame_apptest.cc b/components/html_viewer/html_frame_apptest.cc
index 10e4fba2ddbfb7b1fd316895247c748fa99ee273..95ba007237547bad8579dd0f089b90710a204e12 100644
--- a/components/html_viewer/html_frame_apptest.cc
+++ b/components/html_viewer/html_frame_apptest.cc
@@ -209,12 +209,11 @@ class HTMLFrameTest : public ViewManagerTestBase {
FrameConnection* result = frame_connection.get();
FrameTreeClient* frame_tree_client = frame_connection->frame_tree_client();
ViewTreeClientPtr tree_client = frame_connection->GetViewTreeClient();
- frame_tree_.reset(new FrameTree(result->GetContentHandlerID(), view,
- frame_tree_delegate_.get(),
- frame_tree_client, frame_connection.Pass(),
- Frame::ClientPropertyMap()));
+ frame_tree_.reset(
+ new FrameTree(result->GetContentHandlerID(), view, tree_client.Pass(),
+ frame_tree_delegate_.get(), frame_tree_client,
+ frame_connection.Pass(), Frame::ClientPropertyMap()));
frame_tree_delegate_->set_frame_tree(frame_tree_.get());
- view->Embed(tree_client.Pass());
return result;
}
« no previous file with comments | « no previous file | components/web_view/frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698