Extract executeScript-like functionality into a single ExtensionScriptExecutor class.

chrome/browser/extensions/execute_code_in_tab_function.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/execute_code_in_tab_function.h"
 
 #include "base/bind.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/extensions/file_reader.h"
+#include "chrome/browser/extensions/script_executor.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_message_bundle.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 
 using content::BrowserThread;
+using extensions::ScriptExecutor;
 
 namespace keys = extension_tabs_module_constants;
 
 ExecuteCodeInTabFunction::ExecuteCodeInTabFunction()
     : execute_tab_id_(-1),
       all_frames_(false),
       run_at_(UserScript::DOCUMENT_IDLE) {
 }
 
 ExecuteCodeInTabFunction::~ExecuteCodeInTabFunction() {}
@@ skipping 94 matching lines @@
     return false;
   }
 
   scoped_refptr<FileReader> file_reader(new FileReader(
       resource_, base::Bind(&ExecuteCodeInTabFunction::DidLoadFile, this)));
   file_reader->Start();
 
   return true;
 }
 
-bool ExecuteCodeInTabFunction::OnMessageReceived(const IPC::Message& message) {
-  if (message.type() != ExtensionHostMsg_ExecuteCodeFinished::ID)
-    return false;
-
-  int message_request_id;
-  PickleIterator iter(message);
-  if (!message.ReadInt(&iter, &message_request_id)) {
-    NOTREACHED() << "malformed extension message";
-    return true;
-  }
-
-  if (message_request_id != request_id())
-    return false;
-
-  IPC_BEGIN_MESSAGE_MAP(ExecuteCodeInTabFunction, message)
-    IPC_MESSAGE_HANDLER(ExtensionHostMsg_ExecuteCodeFinished,
-                        OnExecuteCodeFinished)
-  IPC_END_MESSAGE_MAP()
-  return true;
-}
-
-void ExecuteCodeInTabFunction::OnExecuteCodeFinished(int request_id,
-                                                     bool success,
+void ExecuteCodeInTabFunction::OnExecuteCodeFinished(bool success,
                                                      const std::string& error) {
   if (!error.empty()) {
     CHECK(!success);
     error_ = error;
   }
 
   SendResponse(success);
-
-  Observe(NULL);
-  Release();  // balanced in Execute()
 }
 
 void ExecuteCodeInTabFunction::DidLoadFile(bool success,
                                            const std::string& data) {
   std::string function_name = name();
   const Extension* extension = GetExtension();
 
   // Check if the file is CSS and needs localization.
   if (success &&
       function_name == TabsInsertCSSFunction::function_name() &&
@@ skipping 65 matching lines @@
     SendResponse(false);
     return false;
   }
 
   const Extension* extension = GetExtension();
   if (!extension) {
     SendResponse(false);
     return false;
   }
 
-  bool is_js_code = true;
+  ScriptExecutor::ScriptType script_type = ScriptExecutor::JAVASCRIPT;
   std::string function_name = name();
   if (function_name == TabsInsertCSSFunction::function_name()) {
-    is_js_code = false;
+    script_type = ScriptExecutor::CSS;
   } else if (function_name != TabsExecuteScriptFunction::function_name()) {
-    DCHECK(false);
+    NOTREACHED();
   }
 
-  ExtensionMsg_ExecuteCode_Params params;
-  params.request_id = request_id();
-  params.extension_id = extension->id();
-  params.is_javascript = is_js_code;
-  params.code = code_string;
-  params.all_frames = all_frames_;
-  params.run_at = run_at_;
-  params.in_main_world = false;
-  contents->web_contents()->GetRenderViewHost()->Send(
-      new ExtensionMsg_ExecuteCode(
-          contents->web_contents()->GetRenderViewHost()->GetRoutingID(),
-          params));
-
-  Observe(contents->web_contents());
-  AddRef();  // balanced in OnExecuteCodeFinished()
+  contents->extension_script_executor()->ExecuteScript(
+      extension->id(),
+      script_type,
+      code_string,
+      all_frames_ ? ScriptExecutor::ALL_FRAMES : ScriptExecutor::TOP_FRAME,
+      run_at_,
+      ScriptExecutor::ISOLATED_WORLD,
+      base::Bind(&ExecuteCodeInTabFunction::OnExecuteCodeFinished, this));
   return true;
 }