Rename PluginService to PluginServiceImpl.

content/browser/plugin_service_impl.h

 // 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.
 
 // This class responds to requests from renderers for the list of plugins, and
 // also a proxy object for plugin instances.
 
-#ifndef CONTENT_BROWSER_PLUGIN_SERVICE_H_
-#define CONTENT_BROWSER_PLUGIN_SERVICE_H_
+#ifndef CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_
+#define CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_
 #pragma once
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/singleton.h"
 #include "base/synchronization/waitable_event_watcher.h"
 #include "build/build_config.h"
@@ skipping 30 matching lines @@
 struct PluginServiceFilterParams;
 }
 
 namespace webkit {
 namespace npapi {
 class PluginGroup;
 class PluginList;
 }
 }
 
-class CONTENT_EXPORT PluginService
+class CONTENT_EXPORT PluginServiceImpl
     : NON_EXPORTED_BASE(public content::PluginService),
       public base::WaitableEventWatcher::Delegate,
       public content::NotificationObserver {
  public:
-  // Returns the PluginService singleton.
-  static PluginService* GetInstance();
+  // Returns the PluginServiceImpl singleton.
+  static PluginServiceImpl* GetInstance();
 
   // content::PluginService implementation:
   virtual void Init() OVERRIDE;
   virtual void StartWatchingPlugins() OVERRIDE;
   virtual PluginProcessHost* FindNpapiPluginProcess(
       const FilePath& plugin_path) OVERRIDE;
   virtual bool GetPluginInfoArray(
       const GURL& url,
       const std::string& mime_type,
       bool allow_wildcard,
@@ skipping 59 matching lines @@
                                 PpapiPluginProcessHost::PluginClient* client);
   void OpenChannelToPpapiBroker(const FilePath& path,
                                 PpapiPluginProcessHost::BrokerClient* client);
 
   // Cancels opening a channel to a NPAPI plugin.
   void CancelOpenChannelToNpapiPlugin(PluginProcessHost::Client* client);
 
   void SetPluginListForTesting(webkit::npapi::PluginList* plugin_list);
 
  private:
-  friend struct DefaultSingletonTraits<PluginService>;
+  friend struct DefaultSingletonTraits<PluginServiceImpl>;
 
-  // Creates the PluginService object, but doesn't actually build the plugin
+  // Creates the PluginServiceImpl object, but doesn't actually build the plugin
   // list yet.  It's generated lazily.
-  PluginService();
-  virtual ~PluginService();
+  PluginServiceImpl();
+  virtual ~PluginServiceImpl();
 
   // base::WaitableEventWatcher::Delegate implementation.
   virtual void OnWaitableEventSignaled(
       base::WaitableEvent* waitable_event) OVERRIDE;
 
   // content::NotificationObserver implementation
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
@@ skipping 62 matching lines @@
 
   // Weak pointer; outlives us.
   content::PluginServiceFilter* filter_;
 
   std::set<PluginProcessHost::Client*> pending_plugin_clients_;
 
 #if defined(OS_POSIX)
   scoped_refptr<PluginLoaderPosix> plugin_loader_;
 #endif
 
-  DISALLOW_COPY_AND_ASSIGN(PluginService);
+  DISALLOW_COPY_AND_ASSIGN(PluginServiceImpl);
 };
 
-DISABLE_RUNNABLE_METHOD_REFCOUNT(PluginService);

[Nico, 2011/12/21 03:38:39]

Did you lose this intentionally?

[jam, 2011/12/21 04:56:50]

it's not needed anymore now that we use bind

-
-#endif  // CONTENT_BROWSER_PLUGIN_SERVICE_H_
+#endif  // CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_