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

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

Issue 2753773003: v8bindings: Reverts crrev.com/2606723002 with minimum changes. (Closed)
Patch Set: Updated tests and their expectations. Created 3 years, 9 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 <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 4005 matching lines...) Expand 10 before | Expand all | Expand 10 after
4016 4016
4017 // The proxy in the parent process should also receive the updated name. 4017 // The proxy in the parent process should also receive the updated name.
4018 // Now iframe's name and the content window's name differ, so it shouldn't 4018 // Now iframe's name and the content window's name differ, so it shouldn't
4019 // be possible to access to the content window with the updated name. 4019 // be possible to access to the content window with the updated name.
4020 bool success = false; 4020 bool success = false;
4021 EXPECT_TRUE( 4021 EXPECT_TRUE(
4022 ExecuteScriptAndExtractBool(shell(), 4022 ExecuteScriptAndExtractBool(shell(),
4023 "window.domAutomationController.send(" 4023 "window.domAutomationController.send("
4024 " frames['updated-name'] === undefined);", 4024 " frames['updated-name'] === undefined);",
4025 &success)); 4025 &success));
4026 EXPECT_TRUE(success); 4026 // TODO(yukishiino): The following expectation should be TRUE, but we're
4027 // intentionally disabling the name and origin check of the named access on
4028 // window. See also crbug.com/538562 and crbug.com/701489.
4029 EXPECT_FALSE(success);
4027 // Change iframe's name to match the content window's name so that it can 4030 // Change iframe's name to match the content window's name so that it can
4028 // reference the child frame by its new name in case of cross origin. 4031 // reference the child frame by its new name in case of cross origin.
4029 EXPECT_TRUE( 4032 EXPECT_TRUE(
4030 ExecuteScript(root, "window['3-1-id'].name = 'updated-name';")); 4033 ExecuteScript(root, "window['3-1-id'].name = 'updated-name';"));
4031 success = false; 4034 success = false;
4032 EXPECT_TRUE( 4035 EXPECT_TRUE(
4033 ExecuteScriptAndExtractBool(shell(), 4036 ExecuteScriptAndExtractBool(shell(),
4034 "window.domAutomationController.send(" 4037 "window.domAutomationController.send("
4035 " frames['updated-name'] == frames[0]);", 4038 " frames['updated-name'] == frames[0]);",
4036 &success)); 4039 &success));
(...skipping 5758 matching lines...) Expand 10 before | Expand all | Expand 10 after
9795 9798
9796 // Try the same navigation, but use the browser-initiated path. 9799 // Try the same navigation, but use the browser-initiated path.
9797 NavigateFrameToURL(root->child_at(0), frame_url); 9800 NavigateFrameToURL(root->child_at(0), frame_url);
9798 EXPECT_FALSE(root->child_at(0)->render_manager()->pending_frame_host()); 9801 EXPECT_FALSE(root->child_at(0)->render_manager()->pending_frame_host());
9799 EXPECT_EQ(root->child_at(0)->current_url(), redirected_url); 9802 EXPECT_EQ(root->child_at(0)->current_url(), redirected_url);
9800 EXPECT_EQ(b_site_instance, 9803 EXPECT_EQ(b_site_instance,
9801 root->child_at(0)->current_frame_host()->GetSiteInstance()); 9804 root->child_at(0)->current_frame_host()->GetSiteInstance());
9802 } 9805 }
9803 9806
9804 } // namespace content 9807 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/external/wpt/html/browsers/the-window-object/window-named-properties-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698