Re-commit r22981 after backout at r22992

chrome/browser/renderer_host/browser_render_process_host.cc

 // Copyright (c) 2006-2009 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.
 
 // Represents the browser side of the browser <--> renderer communication
 // channel. There will be one RenderProcessHost per renderer process.
 
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
 
 #include "build/build_config.h"
@@ skipping 29 matching lines @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_helper.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/browser/renderer_host/resource_message_filter.h"
 #include "chrome/browser/renderer_host/web_cache_manager.h"
 #include "chrome/browser/spellchecker.h"
 #include "chrome/browser/visitedlink_master.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/child_process_info.h"
+#include "chrome/common/child_process_host.h"
 #include "chrome/common/chrome_descriptors.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/process_watcher.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/renderer/render_process.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "grit/generated_resources.h"
@@ skipping 134 matching lines @@
     // Go ahead and send whatever we already have buffered up.
     Update(sender);
   }
 
  private:
   bool reset_needed_;
   bool has_receiver_;
   VisitedLinkCommon::Fingerprints pending_;
 };
 
-
-// Used for a View_ID where the renderer has not been attached yet
-const int32 kInvalidViewID = -1;
-
-// Get the path to the renderer executable, which is the same as the
-// current executable.
-bool GetRendererPath(std::wstring* cmd_line) {
-  return PathService::Get(base::FILE_EXE, cmd_line);
-}
-
 BrowserRenderProcessHost::BrowserRenderProcessHost(Profile* profile)
     : RenderProcessHost(profile),
       visible_widgets_(0),
       backgrounded_(true),
       ALLOW_THIS_IN_INITIALIZER_LIST(cached_dibs_cleaner_(
             base::TimeDelta::FromSeconds(5),
             this, &BrowserRenderProcessHost::ClearTransportDIBCache)),
       zygote_child_(false) {
   widget_helper_ = new RenderWidgetHelper();
 
@@ skipping 76 matching lines @@
                            resource_message_filter,
                            io_thread->message_loop(), true,
                            g_browser_process->shutdown_event()));
   // As a preventive mesure, we DCHECK if someone sends a synchronous message
   // with no time-out, which in the context of the browser process we should not
   // be doing.
   channel_->set_sync_messages_with_no_timeout_allowed(false);
 
   // Build command line for renderer, we have to quote the executable name to
   // deal with spaces.
-  std::wstring renderer_path =
-      browser_command_line.GetSwitchValue(switches::kBrowserSubprocessPath);
+  std::wstring renderer_path = ChildProcessHost::GetChildPath();
   if (renderer_path.empty()) {
-    if (!GetRendererPath(&renderer_path)) {
-      // Need to reset the channel we created above or others might think the
-      // connection is live.
-      channel_.reset();
-      return false;
-    }
+    // Need to reset the channel we created above or others might think the
+    // connection is live.
+    channel_.reset();
+    return false;
   }
   CommandLine cmd_line(renderer_path);
   if (logging::DialogsAreSuppressed())
     cmd_line.AppendSwitch(switches::kNoErrorDialogs);
 
   // propagate the following switches to the renderer command line
   // (along with any associated values) if present in the browser command line
   static const wchar_t* const switch_names[] = {
     switches::kRendererAssertTest,
     switches::kRendererCrashTest,
@@ skipping 677 matching lines @@
     profile()->GetExtensionMessageService()->RemoveEventListener(event_name,
                                                                  pid());
   }
 }
 
 void BrowserRenderProcessHost::OnExtensionCloseChannel(int port_id) {
   if (profile()->GetExtensionMessageService()) {
     profile()->GetExtensionMessageService()->CloseChannel(port_id);
   }
 }