Prefix Chrome switches with the switch prefix.

win8/delegate_execute/delegate_execute.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 <atlbase.h>
 #include <atlcom.h>
 #include <atlctl.h>
 #include <initguid.h>
 #include <shellapi.h>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/process_util.h"
 #include "base/string16.h"
-#include "base/utf_string_conversions.h"
 #include "base/win/scoped_com_initializer.h"
 #include "base/win/scoped_handle.h"
 #include "chrome/common/chrome_switches.h"
 #include "command_execute_impl.h"
 #include "win8/delegate_execute/delegate_execute_operation.h"
 #include "win8/delegate_execute/resource.h"
 
 using namespace ATL;
 
 class DelegateExecuteModule
@@ skipping 51 matching lines @@
     } else {
       AtlTrace("Failed to wait for relaunch mutex, result is 0x%x\n", result);
     }
   } else {
     // It is possible that chrome exits so fast that the mutex is not there.
     AtlTrace("No relaunch mutex found\n");
   }
 
   base::win::ScopedCOMInitializer com_initializer;
 
-  string16 flags(ASCIIToWide(operation.relaunch_flags()));
   SHELLEXECUTEINFO sei = { sizeof(sei) };
   sei.fMask = SEE_MASK_FLAG_LOG_USAGE;
   sei.nShow = SW_SHOWNORMAL;
   sei.lpFile = operation.shortcut().value().c_str();
-  sei.lpParameters = flags.c_str();
+  sei.lpParameters = operation.relaunch_flags().c_str();

[cpu_(ooo_6.6-7.5), 2012/09/21 19:28:01]

this is fine but note that my version is defensive because if you change the
interface fro:

string16& relaunch_flags() const { }
to
string16 relaunch_flags() const { }

Then everything works except here you take a pointer to the internal string a
temporary std::string (!!). We had this kind of bugs.

 
   AtlTrace(L"Relaunching Chrome via shortcut [%ls]\n", sei.lpFile);
 
   if (!::ShellExecuteExW(&sei)) {
     int error = HRESULT_FROM_WIN32(::GetLastError());
     AtlTrace("ShellExecute returned 0x%08X\n", error);
     return error;
   }
   return S_OK;
 }
@@ skipping 13 matching lines @@
       case DelegateExecuteOperation::RELAUNCH_CHROME:
         ret_code = RelaunchChrome(operation);
         break;
       default:
         NOTREACHED();
     }
   }
   AtlTrace("delegate_execute exit, code = %d\n", ret_code);
   return ret_code;
 }