Remove the \servers build output directory and place Chrome Frame parts into the root output fold...

chrome_frame/ready_mode/internal/registry_ready_mode_state.cc

 // Copyright (c) 2011 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_frame/ready_mode/internal/registry_ready_mode_state.h"
 
 #include <windows.h>
 
 #include "base/logging.h"
 #include "base/process_util.h"
@@ skipping 41 matching lines @@
   }
   return NULL;
 }
 
 // Attempts to launch a command using the ProcessLauncher. Returns a handle to
 // the launched process, which the caller is responsible for closing, or NULL
 // upon failure.
 HANDLE LaunchCommandViaProcessLauncher(const std::wstring& command_field) {
   HANDLE launched_process = NULL;
 
-  scoped_ptr<CommandLine> command_line(
-      chrome_launcher::CreateUpdateCommandLine(command_field));
-
-  if (command_line != NULL) {
+  scoped_ptr<CommandLine> command_line;
+  if (chrome_launcher::CreateUpdateCommandLine(command_field, &command_line)) {
+    DCHECK(command_line != NULL);
     base::LaunchOptions options;
     options.start_hidden = true;
     base::LaunchProcess(*command_line, options, &launched_process);
   }
 
   return launched_process;
 }
 
 // Waits for the provided process to exit, and verifies that its exit code
 // corresponds to one of the known "success" codes for the installer. If the
@@ skipping 171 matching lines @@
 
 void RegistryReadyModeState::PermanentlyDeclineChromeFrame() {
   if (LaunchAndCheckCommand(google_update::kRegCFOptOutCmdField))
     RefreshStateAndNotify();
 }
 
 void RegistryReadyModeState::AcceptChromeFrame() {
   if (LaunchAndCheckCommand(google_update::kRegCFOptInCmdField))
     NotifyObserver();
 }