cleanup: Use EventRouter instead of ExtensionSystem::Get->event_router()

chrome/browser/extensions/api/automation_internal/automation_internal_api.cc

 // Copyright 2014 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/automation_internal/automation_internal_api.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/api/automation_internal.h"
 #include "content/public/browser/ax_event_notification_details.h"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/event_router.h"
-#include "extensions/browser/extension_system.h"
 #include "ui/accessibility/ax_enums.h"
 #include "ui/accessibility/ax_node_data.h"
 
 namespace extensions {
 class AutomationWebContentsObserver;
 } // namespace extensions
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(extensions::AutomationWebContentsObserver);
 
 namespace extensions {
 
 using ui::AXNodeData;
 
 namespace {
 
 // Dispatches events to the extension message service.
 void DispatchEvent(content::BrowserContext* context,
                    const std::string& event_name,
                    scoped_ptr<base::ListValue> args) {
-  if (context && extensions::ExtensionSystem::Get(context)->event_router()) {
-    scoped_ptr<Event> event(new Event(event_name, args.Pass()));
-    event->restrict_to_browser_context = context;
-    ExtensionSystem::Get(context)->event_router()->BroadcastEvent(event.Pass());
-  }
+  if (!context)

[not at google - send to devlin, 2014/04/17 16:09:46]

the context can't possibly be null here, so you don't need this check.

[limasdf, 2014/04/17 16:22:56]

Done.

+    return;
+  extensions::EventRouter* event_router = extensions::EventRouter::Get(context);
+  if (!event_router)
+    return;
+
+  scoped_ptr<Event> event(new Event(event_name, args.Pass()));
+  event->restrict_to_browser_context = context;
+  event_router->BroadcastEvent(event.Pass());
 }
 
 }  // namespace
 
 // Helper class that receives accessibility data from |WebContents|.
 class AutomationWebContentsObserver
     : public content::WebContentsObserver,
       public content::WebContentsUserData<AutomationWebContentsObserver> {
  public:
   virtual ~AutomationWebContentsObserver() {}
@@ skipping 199 matching lines @@
                                          selection_params.end_index);
       break;
     }
     default:
       NOTREACHED();
   }
   return true;
 }
 
 }  // namespace extensions