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

Side by Side Diff: content/shell/browser/layout_test/blink_test_controller.cc

Issue 1746393002: Quit BlinkTestRunner::TestFinished early if main frame is not local. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@reenable-tests-fixed-by-alex
Patch Set: Rebasing... Created 4 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/shell/browser/layout_test/blink_test_controller.h" 5 #include "content/shell/browser/layout_test/blink_test_controller.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <iostream> 9 #include <iostream>
10 #include <utility> 10 #include <utility>
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 void BlinkTestController::OpenURL(const GURL& url) { 367 void BlinkTestController::OpenURL(const GURL& url) {
368 if (test_phase_ != DURING_TEST) 368 if (test_phase_ != DURING_TEST)
369 return; 369 return;
370 370
371 Shell::CreateNewWindow(main_window_->web_contents()->GetBrowserContext(), 371 Shell::CreateNewWindow(main_window_->web_contents()->GetBrowserContext(),
372 url, 372 url,
373 main_window_->web_contents()->GetSiteInstance(), 373 main_window_->web_contents()->GetSiteInstance(),
374 gfx::Size()); 374 gfx::Size());
375 } 375 }
376 376
377 void BlinkTestController::TestFinishedInSecondaryWindow() { 377 void BlinkTestController::TestFinishedInSecondaryRenderer() {
378 RenderViewHost* render_view_host = 378 RenderViewHost* render_view_host =
379 main_window_->web_contents()->GetRenderViewHost(); 379 main_window_->web_contents()->GetRenderViewHost();
380 render_view_host->Send( 380 render_view_host->Send(
381 new ShellViewMsg_NotifyDone(render_view_host->GetRoutingID())); 381 new ShellViewMsg_NotifyDone(render_view_host->GetRoutingID()));
382 } 382 }
383 383
384 bool BlinkTestController::IsMainWindow(WebContents* web_contents) const { 384 bool BlinkTestController::IsMainWindow(WebContents* web_contents) const {
385 return main_window_ && web_contents == main_window_->web_contents(); 385 return main_window_ && web_contents == main_window_->web_contents();
386 } 386 }
387 387
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
889 } else { 889 } else {
890 printer_->AddErrorMessage(base::StringPrintf( 890 printer_->AddErrorMessage(base::StringPrintf(
891 "FAIL: Unexpected sendBluetoothManualChooserEvent() event name '%s'.", 891 "FAIL: Unexpected sendBluetoothManualChooserEvent() event name '%s'.",
892 event_name.c_str())); 892 event_name.c_str()));
893 return; 893 return;
894 } 894 }
895 bluetooth_chooser_factory_->SendEvent(event, argument); 895 bluetooth_chooser_factory_->SendEvent(event, argument);
896 } 896 }
897 897
898 } // namespace content 898 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/layout_test/blink_test_controller.h ('k') | content/shell/browser/layout_test/notify_done_forwarder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698