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

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

Issue 2714943004: Move unique name generation and tracking into //content. (Closed)
Patch Set: . 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 <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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 // FrameReplicationState is sufficiently complete to avoid trigerring 181 // FrameReplicationState is sufficiently complete to avoid trigerring
182 // asserts that a default/empty FrameReplicationState would). 182 // asserts that a default/empty FrameReplicationState would).
183 FrameReplicationState ReconstructReplicationStateForTesting( 183 FrameReplicationState ReconstructReplicationStateForTesting(
184 TestRenderFrame* test_render_frame) { 184 TestRenderFrame* test_render_frame) {
185 blink::WebLocalFrame* frame = test_render_frame->GetWebFrame(); 185 blink::WebLocalFrame* frame = test_render_frame->GetWebFrame();
186 186
187 FrameReplicationState result; 187 FrameReplicationState result;
188 // can't recover result.scope - no way to get WebTreeScopeType via public 188 // can't recover result.scope - no way to get WebTreeScopeType via public
189 // blink API... 189 // blink API...
190 result.name = frame->assignedName().utf8(); 190 result.name = frame->assignedName().utf8();
191 result.unique_name = frame->uniqueName().utf8(); 191 result.unique_name = test_render_frame->unique_name();
192 result.sandbox_flags = frame->effectiveSandboxFlags(); 192 result.sandbox_flags = frame->effectiveSandboxFlags();
193 // result.should_enforce_strict_mixed_content_checking is calculated in the 193 // result.should_enforce_strict_mixed_content_checking is calculated in the
194 // browser... 194 // browser...
195 result.origin = frame->getSecurityOrigin(); 195 result.origin = frame->getSecurityOrigin();
196 196
197 return result; 197 return result;
198 } 198 }
199 199
200 // Returns CommonNavigationParams for a normal navigation to a data: url, with 200 // Returns CommonNavigationParams for a normal navigation to a data: url, with
201 // navigation_start set to Now() plus the given offset. 201 // navigation_start set to Now() plus the given offset.
(...skipping 2387 matching lines...) Expand 10 before | Expand all | Expand 10 after
2589 ExpectPauseAndResume(3); 2589 ExpectPauseAndResume(3);
2590 blink::WebScriptSource source2( 2590 blink::WebScriptSource source2(
2591 WebString::fromUTF8("function func2() { func1(); }; func2();")); 2591 WebString::fromUTF8("function func2() { func1(); }; func2();"));
2592 frame()->GetWebFrame()->executeScriptInIsolatedWorld(17, &source2, 1); 2592 frame()->GetWebFrame()->executeScriptInIsolatedWorld(17, &source2, 1);
2593 2593
2594 EXPECT_FALSE(IsPaused()); 2594 EXPECT_FALSE(IsPaused());
2595 Detach(); 2595 Detach();
2596 } 2596 }
2597 2597
2598 } // namespace content 2598 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698