Move ExtensionEventRouter and related into extensions namespace

chrome/browser/extensions/event_router_forwarder.h

Index: chrome/browser/extensions/event_router_forwarder.h
diff --git a/chrome/browser/extensions/extension_event_router_forwarder.h b/chrome/browser/extensions/event_router_forwarder.h
similarity index 68%
rename from chrome/browser/extensions/extension_event_router_forwarder.h
rename to chrome/browser/extensions/event_router_forwarder.h
index 78fa04f04d3239e76a351136676d7409cbc62d71..5dd12e2987c8a7d95382ea618c0be84ca355c13d 100644
--- a/chrome/browser/extensions/extension_event_router_forwarder.h
+++ b/chrome/browser/extensions/event_router_forwarder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_EVENT_ROUTER_FORWARDER_H_
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_EVENT_ROUTER_FORWARDER_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_EVENT_ROUTER_FORWARDER_H_
+#define CHROME_BROWSER_EXTENSIONS_EVENT_ROUTER_FORWARDER_H_
 
 #include <string>
 
@@ -14,8 +14,10 @@
 
 class GURL;
 
-// This class forwards events to ExtensionEventRouters.
-// The advantages of this class over direct usage of ExtensionEventRouters are:
+namespace extensions {
+
+// This class forwards events to EventRouters.
+// The advantages of this class over direct usage of EventRouters are:
 // - this class is thread-safe, you can call the functions from UI and IO
 //   thread.
 // - the class can handle if a profile is deleted between the time of sending
@@ -23,14 +25,14 @@ class GURL;
 // - this class can be used in contexts that are not governed by a profile, e.g.
 //   by system URLRequestContexts. In these cases the |restrict_to_profile|
 //   parameter remains NULL and events are broadcasted to all profiles.
-class ExtensionEventRouterForwarder
-    : public base::RefCountedThreadSafe<ExtensionEventRouterForwarder> {
+class EventRouterForwarder
+    : public base::RefCountedThreadSafe<EventRouterForwarder> {
  public:
-  ExtensionEventRouterForwarder();
+  EventRouterForwarder();
 
   // Calls
   //   DispatchEventToRenderers(event_name, event_args, profile, event_url)
-  // on all (original) profiles' ExtensionEventRouters.
+  // on all (original) profiles' EventRouters.
   // May be called on any thread.
   void BroadcastEventToRenderers(const std::string& event_name,
                                  const std::string& event_args,
@@ -39,7 +41,7 @@ class ExtensionEventRouterForwarder
   // Calls
   //   DispatchEventToExtension(extension_id, event_name, event_args,
   //       profile, event_url)
-  // on all (original) profiles' ExtensionEventRouters.
+  // on all (original) profiles' EventRouters.
   // May be called on any thread.
   void BroadcastEventToExtension(const std::string& extension_id,
                                  const std::string& event_name,
@@ -49,7 +51,7 @@ class ExtensionEventRouterForwarder
   // Calls
   //   DispatchEventToRenderers(event_name, event_args,
   //       use_profile_to_restrict_events ? profile : NULL, event_url)
-  // on |profile|'s ExtensionEventRouter. May be called on any thread.
+  // on |profile|'s EventRouter. May be called on any thread.
   void DispatchEventToRenderers(const std::string& event_name,
                                 const std::string& event_args,
                                 void* profile,
@@ -59,7 +61,7 @@ class ExtensionEventRouterForwarder
   // Calls
   //   DispatchEventToExtension(extension_id, event_name, event_args,
   //       use_profile_to_restrict_events ? profile : NULL, event_url)
-  // on |profile|'s ExtensionEventRouter. May be called on any thread.
+  // on |profile|'s EventRouter. May be called on any thread.
   void DispatchEventToExtension(const std::string& extension_id,
                                 const std::string& event_name,
                                 const std::string& event_args,
@@ -69,7 +71,7 @@ class ExtensionEventRouterForwarder
 
  protected:
   // Protected for testing.
-  virtual ~ExtensionEventRouterForwarder();
+  virtual ~EventRouterForwarder();
 
   // Helper function for {Broadcast,Dispatch}EventTo{Extension,Renderers}.
   // Virtual for testing.
@@ -81,20 +83,22 @@ class ExtensionEventRouterForwarder
                            const GURL& event_url);
 
   // Calls DispatchEventToRenderers or DispatchEventToExtension (depending on
-  // whether extension_id == "" or not) of |profile|'s ExtensionEventRouter.
+  // whether extension_id == "" or not) of |profile|'s EventRouter.
   // |profile| may never be NULL.
   // Virtual for testing.
-  virtual void CallExtensionEventRouter(Profile* profile,
-                                        const std::string& extension_id,
-                                        const std::string& event_name,
-                                        const std::string& event_args,
-                                        Profile* restrict_to_profile,
-                                        const GURL& event_url);
+  virtual void CallEventRouter(Profile* profile,
+                               const std::string& extension_id,
+                               const std::string& event_name,
+                               const std::string& event_args,
+                               Profile* restrict_to_profile,
+                               const GURL& event_url);
 
  private:
-  friend class base::RefCountedThreadSafe<ExtensionEventRouterForwarder>;
+  friend class base::RefCountedThreadSafe<EventRouterForwarder>;
 
-  DISALLOW_COPY_AND_ASSIGN(ExtensionEventRouterForwarder);
+  DISALLOW_COPY_AND_ASSIGN(EventRouterForwarder);
 };
 
-#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_EVENT_ROUTER_FORWARDER_H_
+}  // namespace extensions
+
+#endif  // CHROME_BROWSER_EXTENSIONS_EVENT_ROUTER_FORWARDER_H_