Move Extension into extensions namespace

chrome/browser/search_engines/template_url_service.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/search_engines/template_url_service.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/i18n/case_conversion.h"
@@ skipping 418 matching lines @@
       should_notify = true;
     } else {
       ++i;
     }
   }
   if (should_notify)
     NotifyObservers();
 }
 
 
-void TemplateURLService::RegisterExtensionKeyword(const Extension* extension) {
+void TemplateURLService::RegisterExtensionKeyword(
+    const extensions::Extension* extension) {
   // TODO(mpcomplete): disable the keyword when the extension is disabled.
   if (extension->omnibox_keyword().empty())
     return;
 
   Load();
   if (!loaded_) {
     pending_extension_ids_.push_back(extension->id());
     return;
   }
 
   if (!GetTemplateURLForExtension(extension)) {
     TemplateURLData data;
     data.short_name = UTF8ToUTF16(extension->name());
     data.SetKeyword(UTF8ToUTF16(extension->omnibox_keyword()));
     // This URL is not actually used for navigation. It holds the extension's
     // ID, as well as forcing the TemplateURL to be treated as a search keyword.
     data.SetURL(std::string(chrome::kExtensionScheme) + "://" +
         extension->id() + "/?q={searchTerms}");
     Add(new TemplateURL(profile_, data));
   }
 }
 
 void TemplateURLService::UnregisterExtensionKeyword(
-    const Extension* extension) {
+    const extensions::Extension* extension) {
   if (loaded_) {
     TemplateURL* url = GetTemplateURLForExtension(extension);
     if (url)
       Remove(url);
   } else {
     PendingExtensionIDs::iterator i = std::find(pending_extension_ids_.begin(),
         pending_extension_ids_.end(), extension->id());
     if (i != pending_extension_ids_.end())
       pending_extension_ids_.erase(i);
   }
 }
 
 TemplateURL* TemplateURLService::GetTemplateURLForExtension(
-    const Extension* extension) {
+    const extensions::Extension* extension) {
   for (TemplateURLVector::const_iterator i = template_urls_.begin();
        i != template_urls_.end(); ++i) {
     if ((*i)->IsExtensionKeyword() &&
         ((*i)->url_ref().GetHost() == extension->id()))
       return *i;
   }
 
   return NULL;
 }
 
@@ skipping 902 matching lines @@
 }
 
 void TemplateURLService::NotifyLoaded() {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
       content::Source<TemplateURLService>(this),
       content::NotificationService::NoDetails());
 
   for (PendingExtensionIDs::const_iterator i(pending_extension_ids_.begin());
        i != pending_extension_ids_.end(); ++i) {
-    const Extension* extension =
+    const extensions::Extension* extension =
         profile_->GetExtensionService()->GetExtensionById(*i, true);
     if (extension)
       RegisterExtensionKeyword(extension);
   }
   pending_extension_ids_.clear();
 }
 
 void TemplateURLService::SaveDefaultSearchProviderToPrefs(
     const TemplateURL* t_url) {
   PrefService* prefs = GetPrefs();
@@ skipping 842 matching lines @@
     // TODO(mpcomplete): If we allow editing extension keywords, then those
     // should be persisted to disk and synced.
     if (template_url->sync_guid().empty() &&
         !template_url->IsExtensionKeyword()) {
       template_url->data_.sync_guid = guid::GenerateGUID();
       if (service_.get())
         service_->UpdateKeyword(template_url->data());
     }
   }
 }