Remove last dependencies on chrome\common from chrome\plugin.

TBR=avi
Review URL: http://codereview.chromium.org/6677064

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78372 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 9 insertions, 29 deletions

diff --git a/chrome/plugin/plugin_channel.cc b/chrome/plugin/plugin_channel.cc
index 333f99a..10151ad 100644
--- a/chrome/plugin/plugin_channel.cc
+++ b/chrome/plugin/plugin_channel.cc
@@ -10,11 +10,11 @@
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "build/build_config.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/plugin/plugin_thread.h"
 #include "chrome/plugin/webplugin_delegate_stub.h"
 #include "chrome/plugin/webplugin_proxy.h"
 #include "content/common/child_process.h"
+#include "content/common/content_switches.h"
 #include "content/common/plugin_messages.h"
 #include "webkit/plugins/npapi/plugin_instance.h"
 
diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc
index 92cf96f..4ec2c08 100644
--- a/chrome/plugin/plugin_main.cc
+++ b/chrome/plugin/plugin_main.cc
@@ -13,12 +13,9 @@
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/threading/platform_thread.h"
-#include "chrome/common/chrome_constants.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/common/default_plugin.h"
-#include "chrome/common/logging_chrome.h"
 #include "chrome/plugin/plugin_thread.h"
 #include "content/common/child_process.h"
+#include "content/common/content_switches.h"
 #include "content/common/hi_res_timer_manager.h"
 #include "content/common/main_function_params.h"
 #include "ui/base/system_monitor/system_monitor.h"
@@ -163,8 +160,6 @@ int PluginMain(const MainFunctionParams& parameters) {
     }
 #endif
 
-    chrome::RegisterInternalDefaultPlugin();
-
     MessageLoop::current()->Run();
   }
 
diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc
index 66e780a..d0692c8 100644
--- a/chrome/plugin/plugin_thread.cc
+++ b/chrome/plugin/plugin_thread.cc
@@ -19,10 +19,11 @@
 #include "base/lazy_instance.h"
 #include "base/process_util.h"
 #include "base/threading/thread_local.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/plugin/npobject_util.h"
 #include "chrome/renderer/render_thread.h"
 #include "content/common/child_process.h"
+#include "content/common/content_client.h"
+#include "content/common/content_switches.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/plugin_messages.h"
 #include "ipc/ipc_channel_handle.h"
@@ -37,12 +38,6 @@
 
 #if defined(USE_X11)
 #include "ui/base/x/x11_util.h"
-#elif defined(OS_MACOSX)
-#include "base/mac/mac_util.h"
-#include "base/mac/scoped_cftyperef.h"
-#include "base/sys_string_conversions.h"
-#include "grit/chromium_strings.h"
-#include "ui/base/l10n/l10n_util.h"
 #endif
 
 static base::LazyInstance<base::ThreadLocalPointer<PluginThread> > lazy_tls(
@@ -84,21 +79,11 @@ PluginThread::PluginThread()
 
   scoped_refptr<webkit::npapi::PluginLib> plugin(
       webkit::npapi::PluginLib::CreatePluginLib(plugin_path_));
-  if (plugin.get()) {
+  if (plugin.get())
     plugin->NP_Initialize();
 
-#if defined(OS_MACOSX)
-    base::mac::ScopedCFTypeRef<CFStringRef> plugin_name(
-        base::SysUTF16ToCFStringRef(plugin->plugin_info().name));
-    base::mac::ScopedCFTypeRef<CFStringRef> app_name(
-        base::SysUTF16ToCFStringRef(
-            l10n_util::GetStringUTF16(IDS_SHORT_PLUGIN_APP_NAME)));
-    base::mac::ScopedCFTypeRef<CFStringRef> process_name(
-        CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("%@ (%@)"),
-                                 plugin_name.get(), app_name.get()));
-    base::mac::SetProcessName(process_name);
-#endif
-  }
+  content::GetContentClient()->PluginProcessStarted(
+      plugin.get() ? plugin->plugin_info().name : string16());
 
   // Certain plugins, such as flash, steal the unhandled exception filter
   // thus we never get crash reports when they fault. This call fixes it.
diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc
index ff7d55e..b87fe22 100644
--- a/chrome/plugin/webplugin_delegate_stub.cc
+++ b/chrome/plugin/webplugin_delegate_stub.cc
@@ -7,12 +7,12 @@
 #include "build/build_config.h"
 
 #include "base/command_line.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/plugin/npobject_stub.h"
 #include "chrome/plugin/plugin_channel.h"
 #include "chrome/plugin/plugin_thread.h"
 #include "chrome/plugin/webplugin_proxy.h"
 #include "content/common/content_client.h"
+#include "content/common/content_switches.h"
 #include "content/common/plugin_messages.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npruntime.h"
diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc
index bc223dd..8b1be0f 100644
--- a/chrome/plugin/webplugin_proxy.cc
+++ b/chrome/plugin/webplugin_proxy.cc
@@ -29,7 +29,7 @@
 #endif
 
 #if defined(OS_WIN)
-#include "chrome/common/section_util_win.h"
+#include "content/common/section_util_win.h"
 #include "ui/gfx/gdi_util.h"
 #endif