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

content/browser/plugin_service_impl.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 "content/browser/plugin_service_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 117 matching lines @@
 }
 
 }  // namespace content
 
 // static
 PluginServiceImpl* PluginServiceImpl::GetInstance() {
   return Singleton<PluginServiceImpl>::get();
 }
 
 PluginServiceImpl::PluginServiceImpl()
-    : plugin_list_(NULL),
-      ui_locale_(
-          content::GetContentClient()->browser()->GetApplicationLocale()),
-      filter_(NULL) {
+    : plugin_list_(NULL), filter_(NULL) {
 }
 
 PluginServiceImpl::~PluginServiceImpl() {
 #if defined(OS_WIN)
   // Release the events since they're owned by RegKey, not WaitableEvent.
   hkcu_watcher_.StopWatching();
   hklm_watcher_.StopWatching();
   if (hkcu_event_.get())
     hkcu_event_->Release();
   if (hklm_event_.get())
@@ skipping 73 matching lines @@
     VLOG(1) << "Watching for changes in: " << plugin_dirs[i].value();
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(&PluginServiceImpl::RegisterFilePathWatcher, watcher,
                    plugin_dirs[i], file_watcher_delegate_));
     file_watchers_.push_back(watcher);
   }
 #endif
 }
 
-const std::string& PluginServiceImpl::GetUILocale() {
-  return ui_locale_;
-}
-
 PluginProcessHost* PluginServiceImpl::FindNpapiPluginProcess(
     const FilePath& plugin_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   for (BrowserChildProcessHost::Iterator iter(content::PROCESS_TYPE_PLUGIN);
        !iter.Done(); ++iter) {
     PluginProcessHost* plugin = static_cast<PluginProcessHost*>(*iter);
     if (plugin->info().path == plugin_path)
       return plugin;
   }
@@ skipping 41 matching lines @@
   if (plugin_host)
     return plugin_host;
 
   webkit::WebPluginInfo info;
   if (!GetPluginInfoByPath(plugin_path, &info)) {
     return NULL;
   }
 
   // This plugin isn't loaded by any plugin process, so create a new process.
   scoped_ptr<PluginProcessHost> new_host(new PluginProcessHost());
-  if (!new_host->Init(info, ui_locale_)) {
+  if (!new_host->Init(info)) {
     NOTREACHED();  // Init is not expected to fail.
     return NULL;
   }
   return new_host.release();
 }
 
 PpapiPluginProcessHost* PluginServiceImpl::FindOrStartPpapiPluginProcess(
     const FilePath& plugin_path,
     PpapiPluginProcessHost::PluginClient* client) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ skipping 362 matching lines @@
   plugin_list_->RegisterInternalPlugin(info);
 }
 
 string16 PluginServiceImpl::GetPluginGroupName(const std::string& plugin_name) {
   return plugin_list_->GetPluginGroupName(plugin_name);
 }
 
 webkit::npapi::PluginList* PluginServiceImpl::GetPluginList() {
   return plugin_list_;
 }