summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-21 15:57:23 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-21 15:57:23 +0000
commit2e4c50cd49a81bef973b934c236b110e660f3746 (patch)
treeae4a3d58d0a8efc60d47494305b59c57980eac78 /webkit
parent445a971d141c3b745a84f8fed3a2d627789ebf22 (diff)
downloadchromium_src-2e4c50cd49a81bef973b934c236b110e660f3746.zip
chromium_src-2e4c50cd49a81bef973b934c236b110e660f3746.tar.gz
chromium_src-2e4c50cd49a81bef973b934c236b110e660f3746.tar.bz2
Remove deprecated CommandLine::GetLooseValues(), rename to args().
It returned a wstring, when really we wanted the native encoded strings. Fixing the majority of callers actually simplified them in many cases because the callers wanted native strings too. Since I'm touching every caller, I gave it a more useful name. I'm not sure where "loose" came from but it never made sense to me. BUG=24672 Review URL: http://codereview.chromium.org/3028010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53193 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/test_shell_main.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index 203265d..4a5cc46 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -209,7 +209,7 @@ int main(int argc, char* argv[]) {
TestShell::SetFileTestTimeout(timeout_ms);
}
- // Treat the first loose value as the initial URL to open.
+ // Treat the first argument as the initial URL to open.
GURL starting_url;
// Default to a homepage if we're interactive.
@@ -223,14 +223,14 @@ int main(int argc, char* argv[]) {
starting_url = net::FilePathToFileURL(path);
}
- std::vector<std::wstring> loose_values = parsed_command_line.GetLooseValues();
- if (loose_values.size() > 0) {
- GURL url(WideToUTF16Hack(loose_values[0]));
+ const std::vector<CommandLine::StringType>& args = parsed_command_line.args();
+ if (args.size() > 0) {
+ GURL url(args[0]);
if (url.is_valid()) {
starting_url = url;
} else {
// Treat as a relative file path.
- FilePath path = FilePath::FromWStringHack(loose_values[0]);
+ FilePath path = FilePath(args[0]);
file_util::AbsolutePath(&path);
starting_url = net::FilePathToFileURL(path);
}
@@ -358,7 +358,7 @@ int main(int argc, char* argv[]) {
} else {
// TODO(ojan): Provide a way for run-singly tests to pass
// in a hash and then set params.pixel_hash here.
- params.test_url = WideToUTF8(loose_values[0]);
+ params.test_url = starting_url.spec();
TestShell::RunFileTest(params);
}