Revert part of "Remove deprecated CommandLine::GetLooseValues(), rename to args()."

We will need to reapply this once o3d updates to current base/.
This reverts part of commit r53193.

Review URL: http://codereview.chromium.org/2854058

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53280 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 16 insertions, 16 deletions

diff --git a/o3d/converter/cross/converter_main.cc b/o3d/converter/cross/converter_main.cc
index fda6907..ee819a9 100644
--- a/o3d/converter/cross/converter_main.cc
+++ b/o3d/converter/cross/converter_main.cc
@@ -78,16 +78,16 @@ int CrossMain(int argc, char**argv) {
       o3d::UTF8ToFilePath("convert.py"));
 
 
-  const std::vector<CommandLine::StringType>& values = command_line->args();
+  std::vector<std::wstring> values = command_line->GetLooseValues();
   if (values.size() == 1) {
     // If we're only given one argument, then construct the output
     // filename by substituting the extension on the filename (if any)
     // with .o3dtgz.
-    in_filename = FilePath(values[0]);
+    in_filename = o3d::WideToFilePath(values[0]);
     out_filename = in_filename.ReplaceExtension(FILE_PATH_LITERAL(".o3dtgz"));
   } else if (values.size()== 2) {
-    in_filename = FilePath(values[0]);
-    out_filename = FilePath(values[1]);
+    in_filename = o3d::WideToFilePath(values[0]);
+    out_filename = o3d::WideToFilePath(values[1]);
   } else {
     std::cerr << "Usage: " << argv[0]
               << " [ options ] <infile.dae> [ <outfile> ]\n";
diff --git a/o3d/converter/cross/verifier_main.cc b/o3d/converter/cross/verifier_main.cc
index 1f7280c..931fa39 100644
--- a/o3d/converter/cross/verifier_main.cc
+++ b/o3d/converter/cross/verifier_main.cc
@@ -69,12 +69,12 @@ int CrossMain(int argc, char**argv) {
 
   FilePath in_filename, out_filename;
 
-  const std::vector<CommandLine::StringType>& values = args->args();
+  std::vector<std::wstring> values = command_line->GetLooseValues();
   if (values.size() == 1) {
-    in_filename = FilePath(values[0]);
+    in_filename = o3d::WideToFilePath(values[0]);
   } else if (values.size()== 2) {
-    in_filename = FilePath(values[0]);
-    out_filename = FilePath(values[1]);
+    in_filename = o3d::WideToFilePath(values[0]);
+    out_filename = o3d::WideToFilePath(values[1]);
   } else {
     std::cerr << "Usage: " << FilePath(argv[0]).BaseName().value()
               << " [--no-condition] <infile.fx> [<outfile.fx>]\n";
diff --git a/o3d/converter_edge/cross/converter_main.cc b/o3d/converter_edge/cross/converter_main.cc
index 7fc033a..eef1dec 100644
--- a/o3d/converter_edge/cross/converter_main.cc
+++ b/o3d/converter_edge/cross/converter_main.cc
@@ -70,16 +70,16 @@ int CrossMain(int argc, char**argv) {
 
   FilePath in_filename, out_filename;
 
-  const std::vector<CommandLine::StringType>& values = command_line->args();
+  std::vector<std::wstring> values = command_line->GetLooseValues();
   if (values.size() == 1) {
     // If we're only given one argument, then construct the output
     // filename by substituting the extension on the filename (if any)
     // with .o3dtgz.
-    in_filename = FilePath(values[0]);
+    in_filename = o3d::WideToFilePath(values[0]);
     out_filename = in_filename.ReplaceExtension(FILE_PATH_LITERAL(".o3dtgz"));
   } else if (values.size()== 2) {
-    in_filename = FilePath(values[0]);
-    out_filename = FilePath(values[1]);
+    in_filename = o3d::WideToFilePath(values[0]);
+    out_filename = o3d::WideToFilePath(values[1]);
   } else {
     std::cerr << "Usage: " << argv[0]
               << " [ options ] <infile.dae> [ <outfile> ]\n";
diff --git a/o3d/converter_edge/cross/verifier_main.cc b/o3d/converter_edge/cross/verifier_main.cc
index 5c2b954..c401596 100644
--- a/o3d/converter_edge/cross/verifier_main.cc
+++ b/o3d/converter_edge/cross/verifier_main.cc
@@ -69,12 +69,12 @@ int CrossMain(int argc, char**argv) {
 
   FilePath in_filename, out_filename;
 
-  const std::vector<CommandLine::StringType>& values = command_line->args();
+  std::vector<std::wstring> values = command_line->GetLooseValues();
   if (values.size() == 1) {
-    in_filename = FilePath(values[0]);
+    in_filename = o3d::WideToFilePath(values[0]);
   } else if (values.size()== 2) {
-    in_filename = FilePath(values[0]);
-    out_filename = FilePath(values[1]);
+    in_filename = o3d::WideToFilePath(values[0]);
+    out_filename = o3d::WideToFilePath(values[1]);
   } else {
     std::cerr << "Usage: " << FilePath(argv[0]).BaseName().value()
               << " [--no-condition] <infile.fx> [<outfile.fx>]\n";