Few minor changes to TestingAutomationProvider extension automation:

1) Wait for extension popup to load
2) Wait for extensions hosts to load in WaitForAllViews
3) Allow more than one browser action to be visible in views.
4) Add explicit IsPageActionVisible method
BUG=93571
TEST=none

Review URL: http://codereview.chromium.org/8804011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113088 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 24 insertions, 1 deletions

diff --git a/chrome/browser/automation/automation_provider_json.h b/chrome/browser/automation/automation_provider_json.h
index 0c1ba7d..b7a8674 100644
--- a/chrome/browser/automation/automation_provider_json.h
+++ b/chrome/browser/automation/automation_provider_json.h
@@ -15,6 +15,7 @@
 class AutomationId;
 class AutomationProvider;
 class Browser;
+class Extension;
 class Profile;
 class RenderViewHost;
 class TabContents;
@@ -80,7 +81,7 @@ bool GetBrowserAndTabFromJSONArgs(base::DictionaryValue* args,
 // Returns true on success and sets |id|. Otherwise, |error| will be set.
 bool GetAutomationIdFromJSONArgs(
     base::DictionaryValue* args,
-    const std::string& key_name,
+    const std::string& key,
     AutomationId* id,
     std::string* error) WARN_UNUSED_RESULT;
 
@@ -94,4 +95,26 @@ bool GetRenderViewFromJSONArgs(
     RenderViewHost** rvh,
     std::string* error) WARN_UNUSED_RESULT;
 
+// Gets the extension specified by the given dictionary |args|. |args|
+// should contain the given key which refers to an extension ID. Returns
+// true on success and sets |extension|. Otherwise, |error| will be set.
+// The retrieved extension may be disabled or crashed.
+bool GetExtensionFromJSONArgs(
+    base::DictionaryValue* args,
+    const std::string& key,
+    Profile* profile,
+    const Extension** extension,
+    std::string* error) WARN_UNUSED_RESULT;
+
+// Gets the enabled extension specified by the given dictionary |args|. |args|
+// should contain the given key which refers to an extension ID. Returns
+// true on success and sets |extension|. Otherwise, |error| will be set.
+// The retrieved extension will not be disabled or crashed.
+bool GetEnabledExtensionFromJSONArgs(
+    base::DictionaryValue* args,
+    const std::string& key,
+    Profile* profile,
+    const Extension** extension,
+    std::string* error) WARN_UNUSED_RESULT;
+
 #endif  // CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_JSON_H_