Split web_view_internal_api and move part of it to extensions.

extensions/browser/api/execute_code_function_impl.h

 // Copyright 2014 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.
 
 #ifndef EXTENSIONS_BROWSER_API_EXECUTE_CODE_FUNCTION_IMPL_H_
 #define EXTENSIONS_BROWSER_API_EXECUTE_CODE_FUNCTION_IMPL_H_
 
 #include "extensions/browser/api/execute_code_function.h"
 
 #include "extensions/browser/api/tabs/tabs_constants.h"
@@ skipping 15 matching lines @@
 template <typename T>
 ExecuteCodeFunction<T>::ExecuteCodeFunction() {
 }
 
 template <typename T>
 ExecuteCodeFunction<T>::~ExecuteCodeFunction() {
 }
 
 template <typename T>
 void ExecuteCodeFunction<T>::DidLoadFile(bool success,
-                                      const std::string& data) {
-
+                                         const std::string& data) {
   if (!success || !details_->file) {
     DidLoadAndLocalizeFile(success, data);
     return;
   }
 
   ScriptExecutor::ScriptType script_type =
       ShouldInsertCSS() ? ScriptExecutor::CSS : ScriptExecutor::JAVASCRIPT;
 
   std::string extension_id;
   base::FilePath extension_path;
   std::string extension_default_locale;
   if (T::extension()) {
     extension_id = T::extension()->id();
     extension_path = T::extension()->path();
     T::extension()->manifest()->GetString(manifest_keys::kDefaultLocale,
                                           &extension_default_locale);
   }
 
   content::BrowserThread::PostTask(
-      content::BrowserThread::FILE, FROM_HERE,
-      base::Bind(&ExecuteCodeFunction::GetFileURLAndLocalizeCSS, this,
-                  script_type,
-                  data,
-                  extension_id,
-                  extension_path,
-                  extension_default_locale));
+      content::BrowserThread::FILE,

[Fady Samuel, 2014/09/04 20:41:09]

Can you make these changes in the ExecuteCodeFunction CL?

+      FROM_HERE,
+      base::Bind(&ExecuteCodeFunction::GetFileURLAndLocalizeCSS,
+                 this,
+                 script_type,
+                 data,
+                 extension_id,
+                 extension_path,
+                 extension_default_locale));
 }
 
 template <typename T>
 void ExecuteCodeFunction<T>::GetFileURLAndLocalizeCSS(
     ScriptExecutor::ScriptType script_type,
     const std::string& data,
     const std::string& extension_id,
     const base::FilePath& extension_path,
     const std::string& extension_default_locale) {
-
   std::string localized_data = data;
   // Check if the file is CSS and needs localization.
-  if ((script_type == ScriptExecutor::CSS) &&
-      !extension_id.empty() &&
+  if ((script_type == ScriptExecutor::CSS) && !extension_id.empty() &&
       (data.find(MessageBundle::kMessageBegin) != std::string::npos)) {
     scoped_ptr<SubstitutionMap> localization_messages(
         file_util::LoadMessageBundleSubstitutionMap(
             extension_path, extension_id, extension_default_locale));
 
     // We need to do message replacement on the data, so it has to be mutable.
     std::string error;
-    MessageBundle::ReplaceMessagesWithExternalDictionary(*localization_messages,
-                                                         &localized_data,
-                                                         &error);
+    MessageBundle::ReplaceMessagesWithExternalDictionary(
+        *localization_messages, &localized_data, &error);
   }
 
   file_url_ = net::FilePathToFileURL(resource_.GetFilePath());
 
   // Call back DidLoadAndLocalizeFile on the UI thread. The success parameter
   // is always true, because if loading had failed, we wouldn't have had
   // anything to localize.
   content::BrowserThread::PostTask(
-      content::BrowserThread::UI, FROM_HERE,
-      base::Bind(&ExecuteCodeFunction::DidLoadAndLocalizeFile, this,
-                 true, localized_data));
+      content::BrowserThread::UI,
+      FROM_HERE,
+      base::Bind(&ExecuteCodeFunction::DidLoadAndLocalizeFile,
+                 this,
+                 true,
+                 localized_data));
 }
 
 template <typename T>
 void ExecuteCodeFunction<T>::DidLoadAndLocalizeFile(bool success,
-                                                 const std::string& data) {
+                                                    const std::string& data) {
   if (success) {
     if (!Execute(data))
       T::SendResponse(false);
   } else {
     // TODO(viettrungluu): bug: there's no particular reason the path should be
     // UTF-8, in which case this may fail.
-    T::error_ = ErrorUtils::FormatErrorMessage(tabs_constants::kLoadFileError,
+    T::error_ = ErrorUtils::FormatErrorMessage(
+        tabs_constants::kLoadFileError,
         resource_.relative_path().AsUTF8Unsafe());
     T::SendResponse(false);
   }
 }
 
 template <typename T>
 bool ExecuteCodeFunction<T>::Execute(const std::string& code_string) {
   ScriptExecutor* executor = GetScriptExecutor();
   if (!executor)
     return false;
 
   if (!T::extension())
     return false;
 
   ScriptExecutor::ScriptType script_type = ScriptExecutor::JAVASCRIPT;
   if (ShouldInsertCSS())
     script_type = ScriptExecutor::CSS;
 
   ScriptExecutor::FrameScope frame_scope =
-      details_->all_frames.get() && *details_->all_frames ?
-          ScriptExecutor::ALL_FRAMES :
-          ScriptExecutor::TOP_FRAME;
+      details_->all_frames.get() && *details_->all_frames
+          ? ScriptExecutor::ALL_FRAMES
+          : ScriptExecutor::TOP_FRAME;
 
   ScriptExecutor::MatchAboutBlank match_about_blank =
-      details_->match_about_blank.get() && *details_->match_about_blank ?
-          ScriptExecutor::MATCH_ABOUT_BLANK :
-          ScriptExecutor::DONT_MATCH_ABOUT_BLANK;
+      details_->match_about_blank.get() && *details_->match_about_blank
+          ? ScriptExecutor::MATCH_ABOUT_BLANK
+          : ScriptExecutor::DONT_MATCH_ABOUT_BLANK;
 
-  UserScript::RunLocation run_at =
-      UserScript::UNDEFINED;
+  UserScript::RunLocation run_at = UserScript::UNDEFINED;
   switch (details_->run_at) {
     case InjectDetails::RUN_AT_NONE:
     case InjectDetails::RUN_AT_DOCUMENT_IDLE:
       run_at = UserScript::DOCUMENT_IDLE;
       break;
     case InjectDetails::RUN_AT_DOCUMENT_START:
       run_at = UserScript::DOCUMENT_START;
       break;
     case InjectDetails::RUN_AT_DOCUMENT_END:
       run_at = UserScript::DOCUMENT_END;
@@ skipping 47 matching lines @@
   if (!details_->file.get())
     return false;
   resource_ = T::extension()->GetResource(*details_->file);
 
   if (resource_.extension_root().empty() || resource_.relative_path().empty()) {
     T::error_ = tabs_constants::kNoCodeOrFileToExecuteError;
     return false;
   }
 
   int resource_id;
-  if (ExtensionsBrowserClient::Get()->GetComponentExtensionResourceManager()->
-      IsComponentExtensionResource(
-          resource_.extension_root(), resource_.relative_path(),
-          &resource_id)) {
+  if (ExtensionsBrowserClient::Get()
+          ->GetComponentExtensionResourceManager()
+          ->IsComponentExtensionResource(resource_.extension_root(),
+                                         resource_.relative_path(),
+                                         &resource_id)) {
     const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     DidLoadFile(true, rb.GetRawDataResource(resource_id).as_string());
   } else {
     scoped_refptr<FileReader> file_reader(new FileReader(
         resource_, base::Bind(&ExecuteCodeFunction::DidLoadFile, this)));
     file_reader->Start();
   }
 
   return true;
 }
@@ skipping 10 matching lines @@
 }
 
 template <typename T>
 bool ExecuteCodeFunction<T>::ValidationFailure(T* function) {
   return T::ValidationFailure(function);
 }
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_API_EXECUTE_CODE_FUNCTION_IMPL_H_
-