Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / browsertest_util.cc

diff --git a/src/chrome/browser/extensions/browsertest_util.cc b/src/chrome/browser/extensions/browsertest_util.cc
index 4c5bc8c..ceed312 100644 (file)
--- a/src/chrome/browser/extensions/browsertest_util.cc
+++ b/src/chrome/browser/extensions/browsertest_util.cc
@@ -4,10 +4,9 @@
 
 #include "chrome/browser/extensions/browsertest_util.h"
 
-#include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/test/browser_test_utils.h"
-#include "extensions/browser/extension_system.h"
+#include "extensions/browser/extension_host.h"
 #include "extensions/browser/process_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -18,7 +17,7 @@ std::string ExecuteScriptInBackgroundPage(Profile* profile,
                                           const std::string& extension_id,
                                           const std::string& script) {
   extensions::ProcessManager* manager =
-      extensions::ExtensionSystem::Get(profile)->process_manager();
+      extensions::ProcessManager::Get(profile);
   extensions::ExtensionHost* host =
       manager->GetBackgroundHostForExtension(extension_id);
   if (host == NULL) {
@@ -34,5 +33,19 @@ std::string ExecuteScriptInBackgroundPage(Profile* profile,
   return result;
 }
 
+bool ExecuteScriptInBackgroundPageNoWait(Profile* profile,
+                                         const std::string& extension_id,
+                                         const std::string& script) {
+  extensions::ProcessManager* manager =
+      extensions::ProcessManager::Get(profile);
+  extensions::ExtensionHost* host =
+      manager->GetBackgroundHostForExtension(extension_id);
+  if (host == NULL) {
+    ADD_FAILURE() << "Extension " << extension_id << " has no background page.";
+    return false;
+  }
+  return content::ExecuteScript(host->host_contents(), script);
+}
+
 }  // namespace browsertest_util
 }  // namespace extensions