Move Extension into extensions namespace

chrome/browser/automation/automation_provider_json.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/automation/automation_provider_json.h"
 
 #include "base/json/json_writer.h"
 #include "base/json/string_escape.h"
 #include "base/values.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/automation/automation_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/automation_id.h"
 #include "chrome/common/automation_messages.h"
+#include "chrome/common/extensions/extension.h"
 #include "content/public/browser/web_contents.h"
 
 using automation::Error;
 using automation::ErrorCode;
 using content::WebContents;
 
 AutomationJSONReply::AutomationJSONReply(AutomationProvider* provider,
                                          IPC::Message* reply_message)
   : provider_(provider),
     message_(reply_message) {
@@ skipping 147 matching lines @@
   return true;
 }
 
 namespace {
 
 bool GetExtensionFromJSONArgsHelper(
     base::DictionaryValue* args,
     const std::string& key,
     Profile* profile,
     bool include_disabled,
-    const Extension** extension,
+    const extensions::Extension** extension,
     std::string* error) {
   std::string id;
   if (!args->GetString(key, &id)) {
     *error = base::StringPrintf("Missing or invalid key: %s", key.c_str());
     return false;
   }
   ExtensionService* service = profile->GetExtensionService();
   if (!service) {
     *error = "No extensions service.";
     return false;
   }
   if (!service->GetInstalledExtension(id)) {
     // The extension ID does not correspond to any extension, whether crashed
     // or not.
     *error = base::StringPrintf("Extension %s is not installed.",
                                 id.c_str());
     return false;
   }
-  const Extension* installed_extension =
+  const extensions::Extension* installed_extension =
       service->GetExtensionById(id, include_disabled);
   if (!installed_extension) {
     *error = "Extension is disabled or has crashed.";
     return false;
   }
   *extension = installed_extension;
   return true;
 }
 
 }  // namespace
 
 bool GetExtensionFromJSONArgs(
     base::DictionaryValue* args,
     const std::string& key,
     Profile* profile,
-    const Extension** extension,
+    const extensions::Extension** extension,
     std::string* error) {
   return GetExtensionFromJSONArgsHelper(
       args, key, profile, true /* include_disabled */, extension, error);
 }
 
 bool GetEnabledExtensionFromJSONArgs(
     base::DictionaryValue* args,
     const std::string& key,
     Profile* profile,
-    const Extension** extension,
+    const extensions::Extension** extension,
     std::string* error) {
   return GetExtensionFromJSONArgsHelper(
       args, key, profile, false /* include_disabled */, extension, error);
 }