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

Side by Side Diff: content/browser/screen_orientation/screen_orientation_browsertest.cc

Issue 2052633002: Extend the ToRenderFrameHost magic to FrameTreeNode* and Shell* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix induced script bug. Created 4 years, 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <stdlib.h> 5 #include <stdlib.h>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "content/browser/renderer_host/render_widget_host_impl.h" 10 #include "content/browser/renderer_host/render_widget_host_impl.h"
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 IN_PROC_BROWSER_TEST_F(ScreenOrientationLockDisabledBrowserTest, 230 IN_PROC_BROWSER_TEST_F(ScreenOrientationLockDisabledBrowserTest,
231 DISABLED_NotSupported) { 231 DISABLED_NotSupported) {
232 GURL test_url = GetTestUrl("screen_orientation", 232 GURL test_url = GetTestUrl("screen_orientation",
233 "screen_orientation_lock_disabled.html"); 233 "screen_orientation_lock_disabled.html");
234 234
235 TestNavigationObserver navigation_observer(shell()->web_contents(), 1); 235 TestNavigationObserver navigation_observer(shell()->web_contents(), 1);
236 shell()->LoadURL(test_url); 236 shell()->LoadURL(test_url);
237 navigation_observer.Wait(); 237 navigation_observer.Wait();
238 238
239 { 239 {
240 ASSERT_TRUE(ExecuteScript(shell()->web_contents(), "run();")); 240 ASSERT_TRUE(ExecuteScript(shell(), "run();"));
241 241
242 TestNavigationObserver navigation_observer(shell()->web_contents(), 1); 242 TestNavigationObserver navigation_observer(shell()->web_contents(), 1);
243 navigation_observer.Wait(); 243 navigation_observer.Wait();
244 EXPECT_EQ("NotSupportedError", 244 EXPECT_EQ("NotSupportedError",
245 shell()->web_contents()->GetLastCommittedURL().ref()); 245 shell()->web_contents()->GetLastCommittedURL().ref());
246 } 246 }
247 } 247 }
248 #endif // defined(OS_ANDROID) 248 #endif // defined(OS_ANDROID)
249 249
250 } // namespace content 250 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698