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

Side by Side Diff: chrome/test/chromedriver/chrome_launcher.cc

Issue 1358513003: Use correct IntToString variants in //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "chrome/test/chromedriver/chrome_launcher.h" 5 #include "chrome/test/chromedriver/chrome_launcher.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/base64.h" 10 #include "base/base64.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 base::StringPrintf("no chrome binary at %" PRFilePath, 128 base::StringPrintf("no chrome binary at %" PRFilePath,
129 program.value().c_str())); 129 program.value().c_str()));
130 } 130 }
131 base::CommandLine command(program); 131 base::CommandLine command(program);
132 Switches switches; 132 Switches switches;
133 133
134 for (const auto& common_switch : kCommonSwitches) 134 for (const auto& common_switch : kCommonSwitches)
135 switches.SetUnparsedSwitch(common_switch); 135 switches.SetUnparsedSwitch(common_switch);
136 for (const auto& desktop_switch : kDesktopSwitches) 136 for (const auto& desktop_switch : kDesktopSwitches)
137 switches.SetUnparsedSwitch(desktop_switch); 137 switches.SetUnparsedSwitch(desktop_switch);
138 switches.SetSwitch("remote-debugging-port", base::IntToString(port)); 138 switches.SetSwitch("remote-debugging-port", base::UintToString(port));
139 for (const auto& excluded_switch : capabilities.exclude_switches) { 139 for (const auto& excluded_switch : capabilities.exclude_switches) {
140 switches.RemoveSwitch(excluded_switch); 140 switches.RemoveSwitch(excluded_switch);
141 } 141 }
142 switches.SetFromSwitches(capabilities.switches); 142 switches.SetFromSwitches(capabilities.switches);
143 143
144 base::FilePath user_data_dir_path; 144 base::FilePath user_data_dir_path;
145 if (switches.HasSwitch("user-data-dir")) { 145 if (switches.HasSwitch("user-data-dir")) {
146 user_data_dir_path = base::FilePath( 146 user_data_dir_path = base::FilePath(
147 switches.GetSwitchValueNative("user-data-dir")); 147 switches.GetSwitchValueNative("user-data-dir"));
148 } else { 148 } else {
(...skipping 696 matching lines...) Expand 10 before | Expand all | Expand 10 after
845 // Write empty "First Run" file, otherwise Chrome will wipe the default 845 // Write empty "First Run" file, otherwise Chrome will wipe the default
846 // profile that was written. 846 // profile that was written.
847 if (base::WriteFile( 847 if (base::WriteFile(
848 user_data_dir.Append(chrome::kFirstRunSentinel), "", 0) != 0) { 848 user_data_dir.Append(chrome::kFirstRunSentinel), "", 0) != 0) {
849 return Status(kUnknownError, "failed to write first run file"); 849 return Status(kUnknownError, "failed to write first run file");
850 } 850 }
851 return Status(kOk); 851 return Status(kOk);
852 } 852 }
853 853
854 } // namespace internal 854 } // namespace internal
OLDNEW
« no previous file with comments | « chrome/test/chromedriver/chrome/device_manager.cc ('k') | chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698