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

chrome/browser/extensions/api/downloads/downloads_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/downloads/downloads_api.h"
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 263 matching lines @@
     json->SetString(kEstimatedEndTimeKey, TimeToISO8601(now + time_remaining));
   }
   DownloadedByExtension* by_ext = DownloadedByExtension::Get(download_item);
   if (by_ext) {
     json->SetString(kByExtensionIdKey, by_ext->id());
     json->SetString(kByExtensionNameKey, by_ext->name());
     // Lookup the extension's current name() in case the user changed their
     // language. This won't work if the extension was uninstalled, so the name
     // might be the wrong language.
     bool include_disabled = true;
     const extensions::Extension* extension = extensions::ExtensionSystem::Get(

[Devlin, 2014/05/16 15:32:53]

This is totally unrelated to this patch... but since you're here :)

Can you make this:
const Extension* extension = ExtensionRegistry::Get(profile)
    ->GetExtensionById(by_ext->id(), ExtensionRegistry::EVERYTHING);

And then you can take out the extension_system.h and extension_service.h
includes above.

[limasdf, 2014/05/16 16:25:03]

Done.

         profile)->extension_service()->GetExtensionById(
             by_ext->id(), include_disabled);
     if (extension)
       json->SetString(kByExtensionNameKey, extension->name());
   }
   // TODO(benjhayden): Implement fileSize.
   json->SetDouble(kFileSizeKey, download_item->GetTotalBytes());
   return scoped_ptr<base::DictionaryValue>(json);
 }
 
@@ skipping 1435 matching lines @@
   if (Fault(!data->DeterminerCallback(
                 profile, ext_id, filename, conflict_action),
             errors::kUnexpectedDeterminer, error) ||
       Fault((!const_filename.empty() && !valid_filename),
             errors::kInvalidFilename, error))
     return false;
   return true;
 }
 
 void ExtensionDownloadsEventRouter::OnListenerRemoved(
     const extensions::EventListenerInfo& details) {

[Devlin, 2014/05/16 15:32:53]

Can you take out the extensions:: prefixes in this file, too?

[limasdf, 2014/05/16 16:25:03]

Done.

   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DownloadManager* manager = notifier_.GetManager();
   if (!manager)
     return;
   bool determiner_removed = (
       details.event_name == downloads::OnDeterminingFilename::kEventName);
-  extensions::EventRouter* router = extensions::ExtensionSystem::Get(profile_)->
-      event_router();
+  EventRouter* router = EventRouter::Get(profile_);
   bool any_listeners =
     router->HasEventListener(downloads::OnChanged::kEventName) ||
     router->HasEventListener(downloads::OnDeterminingFilename::kEventName);
   if (!determiner_removed && any_listeners)
     return;
   DownloadManager::DownloadVector items;
   manager->GetAllDownloads(&items);
   for (DownloadManager::DownloadVector::const_iterator iter =
        items.begin();
        iter != items.end(); ++iter) {
@@ skipping 18 matching lines @@
 
 // That's all the methods that have to do with filename determination. The rest
 // have to do with the other, less special events.
 
 void ExtensionDownloadsEventRouter::OnDownloadCreated(
     DownloadManager* manager, DownloadItem* download_item) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (download_item->IsTemporary())
     return;
 
-  extensions::EventRouter* router = extensions::ExtensionSystem::Get(profile_)->
-      event_router();
+  EventRouter* router = EventRouter::Get(profile_);
   // Avoid allocating a bunch of memory in DownloadItemToJSON if it isn't going
   // to be used.
   if (!router ||
       (!router->HasEventListener(downloads::OnCreated::kEventName) &&
        !router->HasEventListener(downloads::OnChanged::kEventName) &&
        !router->HasEventListener(
             downloads::OnDeterminingFilename::kEventName))) {
     return;
   }
   scoped_ptr<base::DictionaryValue> json_item(
       DownloadItemToJSON(download_item, profile_));
   DispatchEvent(downloads::OnCreated::kEventName,
                 true,
                 extensions::Event::WillDispatchCallback(),
                 json_item->DeepCopy());
   if (!ExtensionDownloadsEventRouterData::Get(download_item) &&
       (router->HasEventListener(downloads::OnChanged::kEventName) ||
        router->HasEventListener(
            downloads::OnDeterminingFilename::kEventName))) {
     new ExtensionDownloadsEventRouterData(download_item, json_item.Pass());
   }
 }
 
 void ExtensionDownloadsEventRouter::OnDownloadUpdated(
     DownloadManager* manager, DownloadItem* download_item) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  extensions::EventRouter* router = extensions::ExtensionSystem::Get(profile_)->
-      event_router();
+  EventRouter* router = EventRouter::Get(profile_);
   ExtensionDownloadsEventRouterData* data =
     ExtensionDownloadsEventRouterData::Get(download_item);
   if (download_item->IsTemporary() ||
       !router->HasEventListener(downloads::OnChanged::kEventName)) {
     return;
   }
   if (!data) {
     // The download_item probably transitioned from temporary to not temporary,
     // or else an event listener was added.
     data = new ExtensionDownloadsEventRouterData(
@@ skipping 103 matching lines @@
     const extensions::Extension* extension,
     extensions::UnloadedExtensionInfo::Reason reason) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   std::set<const extensions::Extension*>::iterator iter =
       shelf_disabling_extensions_.find(extension);
   if (iter != shelf_disabling_extensions_.end())
     shelf_disabling_extensions_.erase(iter);
 }
 
 }  // namespace extensions