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

Side by Side Diff: content/renderer/render_view_browsertest.cc

Issue 2714943004: Move unique name generation and tracking into //content. (Closed)
Patch Set: Rebase again. 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
« no previous file with comments | « content/renderer/render_frame_proxy.cc ('k') | content/renderer/unique_name_helper.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 #include <tuple> 7 #include <tuple>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 // FrameReplicationState is sufficiently complete to avoid trigerring 183 // FrameReplicationState is sufficiently complete to avoid trigerring
184 // asserts that a default/empty FrameReplicationState would). 184 // asserts that a default/empty FrameReplicationState would).
185 FrameReplicationState ReconstructReplicationStateForTesting( 185 FrameReplicationState ReconstructReplicationStateForTesting(
186 TestRenderFrame* test_render_frame) { 186 TestRenderFrame* test_render_frame) {
187 blink::WebLocalFrame* frame = test_render_frame->GetWebFrame(); 187 blink::WebLocalFrame* frame = test_render_frame->GetWebFrame();
188 188
189 FrameReplicationState result; 189 FrameReplicationState result;
190 // can't recover result.scope - no way to get WebTreeScopeType via public 190 // can't recover result.scope - no way to get WebTreeScopeType via public
191 // blink API... 191 // blink API...
192 result.name = frame->assignedName().utf8(); 192 result.name = frame->assignedName().utf8();
193 result.unique_name = frame->uniqueName().utf8(); 193 result.unique_name = test_render_frame->unique_name();
194 result.sandbox_flags = frame->effectiveSandboxFlags(); 194 result.sandbox_flags = frame->effectiveSandboxFlags();
195 // result.should_enforce_strict_mixed_content_checking is calculated in the 195 // result.should_enforce_strict_mixed_content_checking is calculated in the
196 // browser... 196 // browser...
197 result.origin = frame->getSecurityOrigin(); 197 result.origin = frame->getSecurityOrigin();
198 198
199 return result; 199 return result;
200 } 200 }
201 201
202 // Returns CommonNavigationParams for a normal navigation to a data: url, with 202 // Returns CommonNavigationParams for a normal navigation to a data: url, with
203 // navigation_start set to Now() plus the given offset. 203 // navigation_start set to Now() plus the given offset.
(...skipping 2389 matching lines...) Expand 10 before | Expand all | Expand 10 after
2593 ExpectPauseAndResume(3); 2593 ExpectPauseAndResume(3);
2594 blink::WebScriptSource source2( 2594 blink::WebScriptSource source2(
2595 WebString::fromUTF8("function func2() { func1(); }; func2();")); 2595 WebString::fromUTF8("function func2() { func1(); }; func2();"));
2596 frame()->GetWebFrame()->executeScriptInIsolatedWorld(17, &source2, 1); 2596 frame()->GetWebFrame()->executeScriptInIsolatedWorld(17, &source2, 1);
2597 2597
2598 EXPECT_FALSE(IsPaused()); 2598 EXPECT_FALSE(IsPaused());
2599 Detach(); 2599 Detach();
2600 } 2600 }
2601 2601
2602 } // namespace content 2602 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_proxy.cc ('k') | content/renderer/unique_name_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698