Remove extra from deprecated pageActions

chrome/browser/extensions/api/extension_action/extension_action_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/extension_action/extension_action_api.h"
 
 #include "base/base64.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 300 matching lines @@
 
 // static
 void ExtensionActionAPI::BrowserActionExecuted(
     content::BrowserContext* context,
     const ExtensionAction& browser_action,
     WebContents* web_contents) {
   ExtensionActionExecuted(context, browser_action, web_contents);
 }
 
 // static
 void ExtensionActionAPI::PageActionExecuted(content::BrowserContext* context,

[Devlin, 2014/08/21 21:44:38]

I'll clean up the rest of this in an (unrelated) CL, but let's kill this part
now.

                                             const ExtensionAction& page_action,
                                             int tab_id,
                                             const std::string& url,
                                             int button) {
-  DispatchOldPageActionEvent(context,
-                             page_action.extension_id(),
-                             page_action.id(),
-                             tab_id,
-                             url,
-                             button);
   WebContents* web_contents = NULL;
   if (!ExtensionTabUtil::GetTabById(
            tab_id,
            Profile::FromBrowserContext(context),
            context->IsOffTheRecord(),
            NULL,
            NULL,
            &web_contents,
            NULL)) {
     return;
@@ skipping 11 matching lines @@
     return;
 
   scoped_ptr<Event> event(new Event(event_name, event_args.Pass()));
   event->restrict_to_browser_context = context;
   event->user_gesture = EventRouter::USER_GESTURE_ENABLED;
   EventRouter::Get(context)
       ->DispatchEventToExtension(extension_id, event.Pass());
 }
 
 // static
-void ExtensionActionAPI::DispatchOldPageActionEvent(
-    content::BrowserContext* context,
-    const std::string& extension_id,
-    const std::string& page_action_id,
-    int tab_id,
-    const std::string& url,
-    int button) {
-  scoped_ptr<base::ListValue> args(new base::ListValue());
-  args->Append(new base::StringValue(page_action_id));
-
-  base::DictionaryValue* data = new base::DictionaryValue();
-  data->Set(page_actions_keys::kTabIdKey, new base::FundamentalValue(tab_id));
-  data->Set(page_actions_keys::kTabUrlKey, new base::StringValue(url));
-  data->Set(page_actions_keys::kButtonKey,
-            new base::FundamentalValue(button));
-  args->Append(data);
-
-  DispatchEventToExtension(context, extension_id, "pageActions", args.Pass());
-}
-
-// static
 void ExtensionActionAPI::ExtensionActionExecuted(
     content::BrowserContext* context,
     const ExtensionAction& extension_action,
     WebContents* web_contents) {
   const char* event_name = NULL;
   switch (extension_action.action_type()) {
     case ActionInfo::TYPE_BROWSER:
       event_name = "browserAction.onClicked";
       break;
     case ActionInfo::TYPE_PAGE:
@@ skipping 433 matching lines @@
   if (host->extension_host_type() != VIEW_TYPE_EXTENSION_POPUP ||
       host->extension()->id() != extension_->id())
     return;
 
   SendResponse(true);
   response_sent_ = true;
   registrar_.RemoveAll();
 }
 
 }  // namespace extensions