Move ExtensionEventRouter and related into extensions namespace

chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_api.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 "chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_api.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/hash_tables.h"
 #include "base/json/json_writer.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/lazy_instance.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_constants.h"
 #include "chrome/browser/extensions/api/tabs/tabs.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
-#include "chrome/browser/extensions/extension_event_names.h"
-#include "chrome/browser/extensions/extension_event_router.h"
+#include "chrome/browser/extensions/event_names.h"
+#include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/window_sizer/window_sizer.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 10 matching lines @@
 
 using content::NativeWebKeyboardEvent;
 using content::NavigationController;
 using content::NotificationDetails;
 using content::NotificationSource;
 using content::WebContents;
 using WebKit::WebInputEvent;
 
 namespace keys = extensions::offscreen_tabs_constants;
 namespace tabs_keys = extensions::tabs_constants;
-namespace events = extension_event_names;
+namespace events = extensions::event_names;
 
 namespace {
 
 class ParentTab;
 
 // This class is responsible for the life cycle of an offscreen tab.
 class OffscreenTab : public content::NotificationObserver {
  public:
   OffscreenTab();
   virtual ~OffscreenTab();
@@ skipping 768 matching lines @@
   // async case (when a "javascript": URL is sent to a tab).
   if (!is_async)
     SendResponse(true);
 
   return true;
 }
 
 void UpdateOffscreenTabFunction::PopulateResult() {
   // There's no result associated with this callback.
 }