Properly add --original-process-start-time for browser rendezvous.

chrome/browser/process_singleton_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/browser/process_singleton.h"
 
 #include <shellapi.h>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 305 matching lines @@
       sei.fMask = SEE_MASK_FLAG_LOG_USAGE;
       sei.nShow = SW_SHOWNORMAL;
       sei.lpFile = url.c_str();
       ::OutputDebugStringA(sei.lpFile);
       sei.lpDirectory = "";
       ::ShellExecuteExA(&sei);
     }
     return PROCESS_NOTIFIED;
   }
 
+  CommandLine command_line(*CommandLine::ForCurrentProcess());
+  command_line.AppendSwitchASCII(
+      switches::kOriginalProcessStartTime,
+      base::Int64ToString(
+          base::CurrentProcessInfo::CreationTime()->ToInternalValue()));
+
   // Non-metro mode, send our command line to the other chrome message window.
   // format is "START\0<<<current directory>>>\0<<<commandline>>>".
   std::wstring to_send(L"START\0", 6);  // want the NULL in the string.
   base::FilePath cur_dir;
   if (!PathService::Get(base::DIR_CURRENT, &cur_dir))
     return PROCESS_NONE;
   to_send.append(cur_dir.value());
   to_send.append(L"\0", 1);  // Null separator.
-  to_send.append(::GetCommandLineW());
-  // Add the process start time as a flag.
-  to_send.append(L" --");
-  to_send.append(ASCIIToWide(switches::kOriginalProcessStartTime));
-  to_send.append(L"=");
-  to_send.append(base::Int64ToString16(
-      base::CurrentProcessInfo::CreationTime()->ToInternalValue()));
+  to_send.append(command_line.GetCommandLineString());
   to_send.append(L"\0", 1);  // Null separator.
 
   base::win::ScopedHandle process_handle;
   if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
       base::OpenProcessHandleWithAccess(
           process_id, PROCESS_QUERY_INFORMATION,
           process_handle.Receive()) &&
       base::win::IsProcessImmersive(process_handle.Get())) {
     chrome::ActivateMetroChrome();
   }
@@ skipping 213 matching lines @@
   switch (message) {
     case WM_COPYDATA:
       return OnCopyData(reinterpret_cast<HWND>(wparam),
                         reinterpret_cast<COPYDATASTRUCT*>(lparam));
     default:
       break;
   }
 
   return ::DefWindowProc(hwnd, message, wparam, lparam);
 }