Move platform_thread to base/threading and put in the base namespace. I left ...

chrome/common/chrome_plugin_lib.cc

 // Copyright (c) 2010 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/common/chrome_plugin_lib.h"
 
 #include "base/command_line.h"
 #include "base/hash_tables.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/perftimer.h"
+#include "base/string_util.h"
 #include "base/thread.h"
-#if defined(OS_WIN)
-#include "base/win/registry.h"
-#endif
-#include "base/string_util.h"
+#include "base/threading/platform_thread.h"
 #include "chrome/common/chrome_counters.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 
+#if defined(OS_WIN)
+#include "base/win/registry.h"
+#endif
+
 using base::TimeDelta;
 
 // TODO(port): revisit when plugins happier
 #if defined(OS_WIN)
 const wchar_t ChromePluginLib::kRegistryChromePlugins[] =
     L"Software\\Google\\Chrome\\Plugins";
 static const wchar_t kRegistryLoadOnStartup[] = L"LoadOnStartup";
 static const wchar_t kRegistryPath[] = L"Path";
 #endif
 
 typedef base::hash_map<FilePath, scoped_refptr<ChromePluginLib> >
     PluginMap;
 
 // A map of all the instantiated plugins.
 static PluginMap* g_loaded_libs;
 
 // The thread plugins are loaded and used in, lazily initialized upon
 // the first creation call.
-static PlatformThreadId g_plugin_thread_id = 0;
+static base::PlatformThreadId g_plugin_thread_id = 0;
 static MessageLoop* g_plugin_thread_loop = NULL;
 
 static bool IsSingleProcessMode() {
   // We don't support ChromePlugins in single-process mode.
   return CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess);
 }
 
 // static
 bool ChromePluginLib::IsInitialized() {
   return (g_loaded_libs != NULL);
 }
 
 // static
 ChromePluginLib* ChromePluginLib::Create(const FilePath& filename,
                                          const CPBrowserFuncs* bfuncs) {
   // Keep a map of loaded plugins to ensure we only load each library once.
   if (!g_loaded_libs) {
     g_loaded_libs = new PluginMap();
-    g_plugin_thread_id = PlatformThread::CurrentId();
+    g_plugin_thread_id = base::PlatformThread::CurrentId();
     g_plugin_thread_loop = MessageLoop::current();
   }
   DCHECK(IsPluginThread());
 
   PluginMap::const_iterator iter = g_loaded_libs->find(filename);
   if (iter != g_loaded_libs->end())
     return iter->second;
 
   scoped_refptr<ChromePluginLib> plugin(new ChromePluginLib(filename));
   if (!plugin->CP_Initialize(bfuncs))
@@ skipping 18 matching lines @@
   DCHECK(g_loaded_libs);
   PluginMap::iterator iter = g_loaded_libs->find(filename);
   if (iter != g_loaded_libs->end()) {
     iter->second->Unload();
     g_loaded_libs->erase(iter);
   }
 }
 
 // static
 bool ChromePluginLib::IsPluginThread() {
-  return PlatformThread::CurrentId() == g_plugin_thread_id;
+  return base::PlatformThread::CurrentId() == g_plugin_thread_id;
 }
 
 // static
 MessageLoop* ChromePluginLib::GetPluginThreadLoop() {
   return g_plugin_thread_loop;
 }
 
 // static
 void ChromePluginLib::RegisterPluginsWithNPAPI() {
   // We don't support ChromePlugins in single-process mode.
@@ skipping 170 matching lines @@
   if (initialized_)
     CP_Shutdown();
 
 #if defined(OS_WIN)
   if (module_) {
     FreeLibrary(module_);
     module_ = 0;
   }
 #endif
 }