Move ExtensionAction from common/ to browser/.

chrome/browser/automation/testing_automation_provider.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/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 32 matching lines @@
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/download/save_package_file_picker.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/crx_installer.h"
+#include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/extensions/updater/extension_updater.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/importer/importer_host.h"
 #include "chrome/browser/importer/importer_list.h"
@@ skipping 53 matching lines @@
 #include "chrome/browser/view_type_utils.h"
 #include "chrome/common/automation_constants.h"
 #include "chrome/common/automation_events.h"
 #include "chrome/common/automation_id.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/permissions/permission_set.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/extensions/url_pattern_set.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_child_process_host_iterator.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/geolocation.h"
@@ skipping 3841 matching lines @@
   if (!GetBrowserAndTabFromJSONArgs(args, &browser, &tab, &error)) {
     AutomationJSONReply(this, reply_message).SendError(error);
     return;
   }
   const Extension* extension;
   if (!GetEnabledExtensionFromJSONArgs(
           args, "id", browser->profile(), &extension, &error)) {
     AutomationJSONReply(this, reply_message).SendError(error);
     return;
   }
-  ExtensionAction* page_action = extension->page_action();
+  ExtensionAction* page_action = GetPageAction(browser->profile(), *extension);
   if (!page_action) {
     AutomationJSONReply(this, reply_message).SendError(
         "Extension doesn't have any page action.");
     return;
   }
   EnsureTabSelected(browser, tab);
 
   bool pressed = false;
   LocationBarTesting* loc_bar =
       browser->window()->GetLocationBar()->GetLocationBarForTesting();
@@ skipping 32 matching lines @@
   if (!GetBrowserAndTabFromJSONArgs(args, &browser, &tab, &error)) {
     AutomationJSONReply(this, reply_message).SendError(error);
     return;
   }
   const Extension* extension;
   if (!GetEnabledExtensionFromJSONArgs(
           args, "id", browser->profile(), &extension, &error)) {
     AutomationJSONReply(this, reply_message).SendError(error);
     return;
   }
-  ExtensionAction* action = extension->browser_action();
+  ExtensionAction* action = GetBrowserAction(browser->profile(), *extension);
   if (!action) {
     AutomationJSONReply(this, reply_message).SendError(
         "Extension doesn't have any browser action.");
     return;
   }
   EnsureTabSelected(browser, tab);
 
   BrowserActionTestUtil browser_actions(browser);
   int num_browser_actions = browser_actions.NumberOfBrowserActions();
   int action_index = -1;
@@ skipping 2258 matching lines @@
     reply.SendError(error);
     return;
   }
   Browser* browser = automation_util::GetBrowserForTab(tab);
   const Extension* extension;
   if (!GetEnabledExtensionFromJSONArgs(
           args, "extension_id", browser->profile(), &extension, &error)) {
     reply.SendError(error);
     return;
   }
-  ExtensionAction* page_action = extension->page_action();
+  ExtensionAction* page_action = GetPageAction(browser->profile(), *extension);
   if (!page_action) {
     reply.SendError("Extension doesn't have any page action");
     return;
   }
   if (!browser) {
     reply.SendError("Tab does not belong to an open browser");
     return;
   }
   EnsureTabSelected(browser, tab);
 
@@ skipping 94 matching lines @@
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }
 
 void TestingAutomationProvider::EnsureTabSelected(Browser* browser,
                                                   WebContents* tab) {
   if (chrome::GetActiveWebContents(browser) != tab)
     chrome::ActivateTabAt(browser, chrome::GetIndexOfTab(browser, tab), true);
 }