Don't pass class types across EXE/DLL boundaries for SetCommandLine() and SetExperimentList().

chrome/common/child_process_logging_win.cc

 // Copyright (c) 2012 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/child_process_logging.h"
 
 #include <windows.h>
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "content/public/common/gpu_info.h"
 #include "googleurl/src/gurl.h"
 
 namespace child_process_logging {
+
+namespace {
+
 // exported in breakpad_win.cc: void __declspec(dllexport) __cdecl SetActiveURL.
 typedef void (__cdecl *MainSetActiveURL)(const wchar_t*);
 
 // exported in breakpad_win.cc: void __declspec(dllexport) __cdecl SetClientId.
 typedef void (__cdecl *MainSetClientId)(const wchar_t*);
 
 // exported in breakpad_win.cc:
 //   void __declspec(dllexport) __cdecl SetNumberOfExtensions.
 typedef void (__cdecl *MainSetNumberOfExtensions)(int);
 
 // exported in breakpad_win.cc:
 // void __declspec(dllexport) __cdecl SetExtensionID.
 typedef void (__cdecl *MainSetExtensionID)(size_t, const wchar_t*);
 
 // exported in breakpad_win.cc: void __declspec(dllexport) __cdecl SetGpuInfo.
 typedef void (__cdecl *MainSetGpuInfo)(const wchar_t*, const wchar_t*,
                                        const wchar_t*, const wchar_t*,
                                        const wchar_t*);
 
 // exported in breakpad_win.cc:
 //     void __declspec(dllexport) __cdecl SetPrinterInfo.
 typedef void (__cdecl *MainSetPrinterInfo)(const wchar_t*);
 
 // exported in breakpad_win.cc:
 //   void __declspec(dllexport) __cdecl SetNumberOfViews.
 typedef void (__cdecl *MainSetNumberOfViews)(int);
 
 // exported in breakpad_win.cc:
 //   void __declspec(dllexport) __cdecl SetCommandLine
-typedef void (__cdecl *MainSetCommandLine)(const CommandLine*);
+typedef void (__cdecl *MainSetCommandLine)(const wchar_t**, size_t);
 
 // exported in breakpad_field_trial_win.cc:
 //   void __declspec(dllexport) __cdecl SetExperimentList
-typedef void (__cdecl *MainSetExperimentList)(const std::vector<string16>&);
+typedef void (__cdecl *MainSetExperimentList)(const wchar_t**, size_t);
+
+// Copied from breakpad_win.cc.
+void StringVectorToCStringVector(const std::vector<std::wstring>& wstrings,
+                                 std::vector<const wchar_t*>* cstrings) {
+  cstrings->clear();
+  cstrings->reserve(wstrings.size());
+  for (size_t i = 0; i < wstrings.size(); ++i)
+    cstrings->push_back(wstrings[i].c_str());
+}
+
+}  // namespace
 
 void SetActiveURL(const GURL& url) {
   static MainSetActiveURL set_active_url = NULL;
   // note: benign race condition on set_active_url.
   if (!set_active_url) {
     HMODULE exe_module = GetModuleHandle(chrome::kBrowserProcessExecutableName);
     if (!exe_module)
       return;
     set_active_url = reinterpret_cast<MainSetActiveURL>(
         GetProcAddress(exe_module, "SetActiveURL"));
@@ skipping 118 matching lines @@
   // note: benign race condition on set_command_line.
   if (!set_command_line) {
     HMODULE exe_module = GetModuleHandle(chrome::kBrowserProcessExecutableName);
     if (!exe_module)
       return;
     set_command_line = reinterpret_cast<MainSetCommandLine>(
         GetProcAddress(exe_module, "SetCommandLine"));
     if (!set_command_line)
       return;
   }
-  (set_command_line)(command_line);
+
+  std::vector<const wchar_t*> cstrings;
+  StringVectorToCStringVector(command_line->argv(), &cstrings);
+  (set_command_line)(&cstrings[0], cstrings.size());
 }
 
 void SetExperimentList(const std::vector<string16>& state) {
   static MainSetExperimentList set_experiment_list = NULL;
   // note: benign race condition on set_experiment_list.
   if (!set_experiment_list) {
     HMODULE exe_module = GetModuleHandle(chrome::kBrowserProcessExecutableName);
     if (!exe_module)
       return;
     set_experiment_list = reinterpret_cast<MainSetExperimentList>(
         GetProcAddress(exe_module, "SetExperimentList"));
     if (!set_experiment_list)
       return;
   }
-  (set_experiment_list)(state);
+
+  std::vector<const wchar_t*> cstrings;
+  StringVectorToCStringVector(state, &cstrings);
+  (set_experiment_list)(&cstrings[0], cstrings.size());
 }
 
 void SetNumberOfViews(int number_of_views) {
   static MainSetNumberOfViews set_number_of_views = NULL;
   // note: benign race condition on set_number_of_views.
   if (!set_number_of_views) {
     HMODULE exe_module = GetModuleHandle(chrome::kBrowserProcessExecutableName);
     if (!exe_module)
       return;
     set_number_of_views = reinterpret_cast<MainSetNumberOfViews>(
         GetProcAddress(exe_module, "SetNumberOfViews"));
     if (!set_number_of_views)
       return;
   }
   (set_number_of_views)(number_of_views);
 }
 
 }  // namespace child_process_logging