Remove deprecated extension EventRouter APIs.

chrome/browser/extensions/api/omnibox/omnibox_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/omnibox/omnibox_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
@@ skipping 27 matching lines @@
 const char kSuggestionDescriptionStylesRaw[] = "descriptionStylesRaw";
 const char kDescriptionStylesType[] = "type";
 const char kDescriptionStylesOffset[] = "offset";
 const char kDescriptionStylesLength[] = "length";
 
 }  // namespace
 
 // static
 void ExtensionOmniboxEventRouter::OnInputStarted(
     Profile* profile, const std::string& extension_id) {
-  scoped_ptr<ListValue> event_args(new ListValue());
-  extensions::ExtensionSystem::Get(profile)->event_router()->
-      DispatchEventToExtension(extension_id, events::kOnInputStarted,
-                               event_args.Pass(), profile, GURL());
+  scoped_ptr<ListValue> args(new ListValue());
+  scoped_ptr<Event> event(new Event(
+      events::kOnInputStarted, args.Pass()));

[Yoyo Zhou, 2012/12/05 22:28:32]

I think you can inline the args (and make_scoped_ptr makes it shorter).

[Matt Perry, 2012/12/05 22:53:53]

Done.

+  event->restrict_to_profile = profile;
+  ExtensionSystem::Get(profile)->event_router()->
+      DispatchEventToExtension(extension_id, event.Pass());
 }
 
 // static
 bool ExtensionOmniboxEventRouter::OnInputChanged(
     Profile* profile, const std::string& extension_id,
     const std::string& input, int suggest_id) {
   if (!extensions::ExtensionSystem::Get(profile)->event_router()->
           ExtensionHasEventListener(extension_id, events::kOnInputChanged))
     return false;
 
   scoped_ptr<ListValue> args(new ListValue());
   args->Set(0, Value::CreateStringValue(input));
   args->Set(1, Value::CreateIntegerValue(suggest_id));
 
-  extensions::ExtensionSystem::Get(profile)->event_router()->
-      DispatchEventToExtension(extension_id, events::kOnInputChanged,
-                               args.Pass(), profile, GURL());
+  scoped_ptr<Event> event(new Event(events::kOnInputChanged, args.Pass()));
+  event->restrict_to_profile = profile;
+  ExtensionSystem::Get(profile)->event_router()->
+      DispatchEventToExtension(extension_id, event.Pass());
   return true;
 }
 
 // static
 void ExtensionOmniboxEventRouter::OnInputEntered(
     content::WebContents* web_contents,
     const std::string& extension_id,
     const std::string& input) {
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
 
   const Extension* extension =
       ExtensionSystem::Get(profile)->extension_service()->extensions()->
           GetByID(extension_id);
   CHECK(extension);
   extensions::TabHelper::FromWebContents(web_contents)->
       active_tab_permission_granter()->GrantIfRequested(extension);
 
   scoped_ptr<ListValue> args(new ListValue());
   args->Set(0, Value::CreateStringValue(input));
 
-  extensions::ExtensionSystem::Get(profile)->event_router()->
-      DispatchEventToExtension(extension_id, events::kOnInputEntered,
-                               args.Pass(), profile, GURL());
+  scoped_ptr<Event> event(new Event(events::kOnInputEntered, args.Pass()));
+  event->restrict_to_profile = profile;
+  ExtensionSystem::Get(profile)->event_router()->
+      DispatchEventToExtension(extension_id, event.Pass());
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_OMNIBOX_INPUT_ENTERED,
       content::Source<Profile>(profile),
       content::NotificationService::NoDetails());
 }
 
 // static
 void ExtensionOmniboxEventRouter::OnInputCancelled(
     Profile* profile, const std::string& extension_id) {
   scoped_ptr<ListValue> args(new ListValue());
-  extensions::ExtensionSystem::Get(profile)->event_router()->
-      DispatchEventToExtension(extension_id, events::kOnInputCancelled,
-                               args.Pass(), profile, GURL());
+  scoped_ptr<Event> event(new Event(events::kOnInputCancelled, args.Pass()));
+  event->restrict_to_profile = profile;
+  ExtensionSystem::Get(profile)->event_router()->
+      DispatchEventToExtension(extension_id, event.Pass());
 }
 
 bool OmniboxSendSuggestionsFunction::RunImpl() {
   ExtensionOmniboxSuggestions suggestions;
   ListValue* suggestions_value;
   EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &suggestions.request_id));
   EXTENSION_FUNCTION_VALIDATE(args_->GetList(1, &suggestions_value));
 
   suggestions.suggestions.resize(suggestions_value->GetSize());
   for (size_t i = 0; i < suggestions_value->GetSize(); ++i) {
@@ skipping 183 matching lines @@
     for (size_t i = 0; i < description_styles.size(); ++i) {
       if (description_styles[i].offset > placeholder)
         description_styles[i].offset += replacement.length() - 2;
     }
   }
 
   match->contents.assign(description);
 }
 
 }  // namespace extensions