Moved ExtensionMessage* into extensions namespace

chrome/browser/extensions/api/tabs/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/api/tabs/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/api/tabs/tabs.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/tab_helper.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.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 "chrome/common/extensions/message_bundle.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 
 using content::BrowserThread;
 using extensions::ScriptExecutor;
 
 namespace keys = extensions::tabs_constants;
 
 ExecuteCodeInTabFunction::ExecuteCodeInTabFunction()
     : execute_tab_id_(-1),
@@ skipping 127 matching lines @@
 
 void ExecuteCodeInTabFunction::DidLoadFile(bool success,
                                            const std::string& data) {
   std::string function_name = name();
   const extensions::Extension* extension = GetExtension();
 
   // Check if the file is CSS and needs localization.
   if (success &&
       function_name == TabsInsertCSSFunction::function_name() &&
       extension != NULL &&
-      data.find(ExtensionMessageBundle::kMessageBegin) != std::string::npos) {
+      data.find(
+          extensions::MessageBundle::kMessageBegin) != std::string::npos) {
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(&ExecuteCodeInTabFunction::LocalizeCSS, this,
                    data,
                    extension->id(),
                    extension->path(),
                    extension->default_locale()));
   } else {
     DidLoadAndLocalizeFile(success, data);
   }
 }
 
 void ExecuteCodeInTabFunction::LocalizeCSS(
     const std::string& data,
     const std::string& extension_id,
     const FilePath& extension_path,
     const std::string& extension_default_locale) {
   scoped_ptr<SubstitutionMap> localization_messages(
-      extension_file_util::LoadExtensionMessageBundleSubstitutionMap(
+      extension_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 css_data = data;
   std::string error;
-  ExtensionMessageBundle::ReplaceMessagesWithExternalDictionary(
+  extensions::MessageBundle::ReplaceMessagesWithExternalDictionary(
       *localization_messages, &css_data, &error);
 
   // 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.
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&ExecuteCodeInTabFunction::DidLoadAndLocalizeFile, this,
                  true, css_data));
 }
@@ skipping 43 matching lines @@
   contents->extension_tab_helper()->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;
 }