Rename some chrome.exe exports: SetCommandLine --> SetCommandLine2, SetExperimentList --> SetExperi…

chrome/app/breakpad_win.cc

Index: chrome/app/breakpad_win.cc
diff --git a/chrome/app/breakpad_win.cc b/chrome/app/breakpad_win.cc
index 90a98e93c1f76968f69e323ad88b57b5bc830b63..d8e91109fe80559f1fe847eb329432facbf8fa61 100644
--- a/chrome/app/breakpad_win.cc
+++ b/chrome/app/breakpad_win.cc
@@ -151,7 +151,7 @@ bool IsBoringCommandLineSwitch(const std::wstring& flag) {
          flag == L"--flag-switches-end";
 }
 
-extern "C" void __declspec(dllexport) __cdecl SetCommandLine(
+extern "C" void __declspec(dllexport) __cdecl SetCommandLine2(

[Sigurður Ásgeirsson, 2012/05/23 21:30:31]

Please add a comment here (and other places where these exports are perpetrated)
that it's critical to change the name when the arguments change.
This will protect against maintenance brittleness.

[eroman, 2012/05/23 21:45:13]

Done.

     const wchar_t** argv, size_t argc) {
   if (!g_custom_entries)
     return;
@@ -302,7 +302,7 @@ google_breakpad::CustomClientInfo* GetCustomInfo(const std::wstring& exe_path,
       google_breakpad::CustomInfoEntry(L"guid", guid.c_str()));
 
   // Add empty values for the command line switches. We will fill them with
-  // actual values as part of SetCommandLine().
+  // actual values as part of SetCommandLine2().
   g_num_switches_offset = g_custom_entries->size();
   g_custom_entries->push_back(
       google_breakpad::CustomInfoEntry(L"num-switches", L""));
@@ -315,12 +315,12 @@ google_breakpad::CustomClientInfo* GetCustomInfo(const std::wstring& exe_path,
   }
 
   // Fill in the command line arguments using CommandLine::ForCurrentProcess().
-  // The browser process may call SetCommandLine() again later on with a command
-  // line that has been augmented with the about:flags experiments.
+  // The browser process may call SetCommandLine2() again later on with a
+  // command line that has been augmented with the about:flags experiments.
   std::vector<const wchar_t*> switches;
   StringVectorToCStringVector(
       CommandLine::ForCurrentProcess()->argv(), &switches);
-  SetCommandLine(&switches[0], switches.size());
+  SetCommandLine2(&switches[0], switches.size());
 
   if (type == L"renderer" || type == L"plugin" || type == L"gpu-process") {
     g_num_of_views_offset = g_custom_entries->size();
@@ -831,4 +831,4 @@ void StringVectorToCStringVector(const std::vector<std::wstring>& wstrings,
   cstrings->reserve(wstrings.size());
   for (size_t i = 0; i < wstrings.size(); ++i)
     cstrings->push_back(wstrings[i].c_str());
-}
+}