CommandLine API rework

chrome/common/chrome_plugin_util.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/chrome_plugin_util.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 103 matching lines @@
     }
   default:
     return CPERR_INVALID_VERSION;
   }
 
   return CPERR_SUCCESS;
 }
 
 CPError CPB_GetCommandLineArgumentsCommon(const char* url,
                                           std::string* arguments) {
-  CommandLine cmd;
+  const CommandLine cmd = *CommandLine::ForCurrentProcess();
   std::wstring arguments_w;
 
   // Use the same UserDataDir for new launches that we currently have set.
   std::wstring user_data_dir = cmd.GetSwitchValue(switches::kUserDataDir);
   if (!user_data_dir.empty()) {
     // Make sure user_data_dir is an absolute path.
     wchar_t user_data_dir_full[MAX_PATH];
     if (_wfullpath(user_data_dir_full, user_data_dir.c_str(), MAX_PATH) &&
         file_util::PathExists(user_data_dir_full)) {
-      CommandLine::AppendSwitchWithValue(
-          &arguments_w, switches::kUserDataDir, user_data_dir_full);
+      arguments_w += std::wstring(L"--") + switches::kUserDataDir +
+                     L'=' + user_data_dir_full;
     }
   }
 
   // Use '--app=url' instead of just 'url' to launch the browser with minimal
   // chrome.
   // Note: Do not change this flag!  Old Gears shortcuts will break if you do!
   std::wstring url_w = UTF8ToWide(url);
-  CommandLine::AppendSwitchWithValue(&arguments_w, switches::kApp, url_w);
+  arguments_w += std::wstring(L"--") + switches::kApp + L'=' + url_w;
 
   *arguments = WideToUTF8(arguments_w);
 
   return CPERR_SUCCESS;
 }
 
 //
 // Host functions shared by browser and plugin processes
 //
 
 void* STDCALL CPB_Alloc(uint32 size) {
   return malloc(size);
 }
 
 void STDCALL CPB_Free(void* memory) {
   free(memory);
 }