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

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

Issue 2228403003: content: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 4 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_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <set> 10 #include <set>
(...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 WebContents::FromRenderFrameHost(frame) == main_window_->web_contents(); 590 WebContents::FromRenderFrameHost(frame) == main_window_->web_contents();
591 591
592 // Track pid of the renderer handling the main frame. 592 // Track pid of the renderer handling the main frame.
593 if (main_window && frame->GetParent() == nullptr) { 593 if (main_window && frame->GetParent() == nullptr) {
594 base::ProcessHandle process_handle = process->GetHandle(); 594 base::ProcessHandle process_handle = process->GetHandle();
595 if (process_handle != base::kNullProcessHandle) 595 if (process_handle != base::kNullProcessHandle)
596 current_pid_ = base::GetProcId(process_handle); 596 current_pid_ = base::GetProcId(process_handle);
597 } 597 }
598 598
599 // Is this the 1st time this renderer contains parts of the main test window? 599 // Is this the 1st time this renderer contains parts of the main test window?
600 if (main_window && !ContainsKey(main_window_render_process_hosts_, process)) { 600 if (main_window &&
601 !base::ContainsKey(main_window_render_process_hosts_, process)) {
601 main_window_render_process_hosts_.insert(process); 602 main_window_render_process_hosts_.insert(process);
602 603
603 // Make sure the new renderer process has a test configuration shared with 604 // Make sure the new renderer process has a test configuration shared with
604 // other renderers. 605 // other renderers.
605 ShellTestConfiguration params; 606 ShellTestConfiguration params;
606 params.current_working_directory = current_working_directory_; 607 params.current_working_directory = current_working_directory_;
607 params.temp_path = temp_path_; 608 params.temp_path = temp_path_;
608 params.test_url = test_url_; 609 params.test_url = test_url_;
609 params.enable_pixel_dumping = enable_pixel_dumping_; 610 params.enable_pixel_dumping = enable_pixel_dumping_;
610 params.allow_external_pages = 611 params.allow_external_pages =
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
944 } else { 945 } else {
945 printer_->AddErrorMessage(base::StringPrintf( 946 printer_->AddErrorMessage(base::StringPrintf(
946 "FAIL: Unexpected sendBluetoothManualChooserEvent() event name '%s'.", 947 "FAIL: Unexpected sendBluetoothManualChooserEvent() event name '%s'.",
947 event_name.c_str())); 948 event_name.c_str()));
948 return; 949 return;
949 } 950 }
950 bluetooth_chooser_factory_->SendEvent(event, argument); 951 bluetooth_chooser_factory_->SendEvent(event, argument);
951 } 952 }
952 953
953 } // namespace content 954 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698