Move creation and ownership of ResourceDispatcherHost and PluginService to content. This gives a ...

content/browser/plugin_process_host.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 "content/browser/plugin_process_host.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include <windows.h>
 #elif defined(OS_POSIX)
 #include <utility>  // for pair<>
@@ skipping 146 matching lines @@
     } else {
       BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                               base::Bind(base::mac::SetCursorVisibility, true));
     }
   }
 #endif
   // Cancel all pending and sent requests.
   CancelRequests();
 }
 
-bool PluginProcessHost::Init(const webkit::WebPluginInfo& info,
-                             const std::string& locale) {
+bool PluginProcessHost::Init(const webkit::WebPluginInfo& info) {
   info_ = info;
   set_name(info_.name);
 
   std::string channel_id = child_process_host()->CreateChannel();
   if (channel_id.empty())
     return false;
 
   // Build command line for plugin. When we have a plugin launcher, we can't
   // allow "self" on linux and we need the real file path.
   const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
@@ skipping 45 matching lines @@
     switches::kV,
   };
 
   cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
                              arraysize(kSwitchNames));
 
   // If specified, prepend a launcher program to the command line.
   if (!plugin_launcher.empty())
     cmd_line->PrependWrapper(plugin_launcher);
 
+  std::string locale =
+      content::GetContentClient()->browser()->GetApplicationLocale();
   if (!locale.empty()) {
     // Pass on the locale so the null plugin will use the right language in the
     // prompt to install the desired plugin.
     cmd_line->AppendSwitchASCII(switches::kLang, locale);
   }
 
   cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id);
 
 #if defined(OS_POSIX)
   base::environment_vector env;
@@ skipping 179 matching lines @@
 }
 
 void PluginProcessHost::OnChannelCreated(
     const IPC::ChannelHandle& channel_handle) {
   Client* client = sent_requests_.front();
 
   if (client)
     client->OnChannelOpened(channel_handle);
   sent_requests_.pop_front();
 }