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

chrome_frame/cfproxy_proxy.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/cfproxy_private.h"
 
 #include "base/tuple.h"
 #include "ipc/ipc_sync_message.h"
 #include "chrome/common/automation_messages.h"
 
@@ skipping 46 matching lines @@
   DelegateHolder::RemoveDelegate(delegate);
   delegate->Disconnected();
 }
 
 void CFProxy::InitInIoThread(const ProxyParams& params) {
   DCHECK(CalledOnIpcThread());
   std::string channel_id = GenerateChannelId();
   ipc_sender_ = api_->CreateChannel(channel_id, this);
   std::wstring cmd_line = BuildCmdLine(channel_id, params.profile_path,
                                        params.extra_params);
-  if (api_->LaunchApp(cmd_line)) {
+  if (!cmd_line.empty() && api_->LaunchApp(cmd_line)) {
     CancelableTask* launch_timeout = NewRunnableMethod(this,
         &CFProxy::LaunchTimeOut);
     ipc_thread_.message_loop()->PostDelayedTask(FROM_HERE, launch_timeout,
         params.timeout.InMilliseconds());
   } else {
     OnPeerLost(ChromeProxyDelegate::CHROME_EXE_LAUNCH_FAILED);
   }
 }
 
 void CFProxy::CleanupOnIoThread() {
@@ skipping 135 matching lines @@
 void CFProxy::OnChannelError() {
   is_connected_ = false;
 
   // Inform the sync message callbacks that there are not going to see
   // any reply.
   sync_dispatcher_.OnChannelClosed();
   OnPeerLost(ChromeProxyDelegate::CHANNEL_ERROR);
 
   // TODO(stoyan): Relaunch?
 }