Moved ExternalExtensionLoaders/Providers into extensions namespace

chrome/browser/extensions/external_registry_loader_win.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/external_registry_extension_loader_win.h"
+#include "chrome/browser/extensions/external_registry_loader_win.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_handle.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "base/win/registry.h"
-#include "chrome/browser/extensions/external_extension_provider_impl.h"
+#include "chrome/browser/extensions/external_provider_impl.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // The Registry subkey that contains information about external extensions.
 const char kRegistryExtensions[] = "Software\\Google\\Chrome\\Extensions";
 
 // Registry value of of that key that defines the path to the .crx file.
 const wchar_t kRegistryExtensionPath[] = L"path";
 
 // Registry value of that key that defines the current version of the .crx file.
 const wchar_t kRegistryExtensionVersion[] = L"version";
 
 bool CanOpenFileForReading(const FilePath& path) {
   ScopedStdioHandle file_handle(file_util::OpenFile(path, "rb"));
   return file_handle.get() != NULL;
 }
 
 }  // namespace
 
-void ExternalRegistryExtensionLoader::StartLoading() {
+namespace extensions {
+
+void ExternalRegistryLoader::StartLoading() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
-      base::Bind(&ExternalRegistryExtensionLoader::LoadOnFileThread, this));
+      base::Bind(&ExternalRegistryLoader::LoadOnFileThread, this));
 }
 
-void ExternalRegistryExtensionLoader::LoadOnFileThread() {
+void ExternalRegistryLoader::LoadOnFileThread() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   base::TimeTicks start_time = base::TimeTicks::Now();
   scoped_ptr<DictionaryValue> prefs(new DictionaryValue);
 
   // A map of IDs, to weed out duplicates between HKCU and HKLM.
   std::set<string16> keys;
   base::win::RegistryKeyIterator iterator_machine_key(
       HKEY_LOCAL_MACHINE, ASCIIToWide(kRegistryExtensions).c_str());
   for (; iterator_machine_key.Valid(); ++iterator_machine_key)
     keys.insert(iterator_machine_key.Name());
@@ skipping 57 matching lines @@
     if (key.ReadValue(kRegistryExtensionVersion, &extension_version)
         != ERROR_SUCCESS) {
       // TODO(erikkay): find a way to get this into about:extensions
       LOG(ERROR) << "Missing value " << kRegistryExtensionVersion
                  << " for key " << key_path << ".";
       continue;
     }
 
     std::string id = WideToASCII(*it);
     StringToLowerASCII(&id);
-    if (!extensions::Extension::IdIsValid(id)) {
+    if (!Extension::IdIsValid(id)) {
       LOG(ERROR) << "Invalid id value " << id
                  << " for key " << key_path << ".";
       continue;
     }
 
     scoped_ptr<Version> version;
     version.reset(Version::GetVersionFromString(
                       WideToASCII(extension_version)));
     if (!version.get()) {
       LOG(ERROR) << "Invalid version value " << extension_version
                  << " for key " << key_path << ".";
       continue;
     }
 
     prefs->SetString(
-        id + "." + ExternalExtensionProviderImpl::kExternalVersion,
+        id + "." + ExternalProviderImpl::kExternalVersion,
         WideToASCII(extension_version));
     prefs->SetString(
-        id + "." + ExternalExtensionProviderImpl::kExternalCrx,
+        id + "." + ExternalProviderImpl::kExternalCrx,
         extension_path_str);
   }
 
   prefs_.reset(prefs.release());
   HISTOGRAM_TIMES("Extensions.ExternalRegistryLoaderWin",
                   base::TimeTicks::Now() - start_time);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      base::Bind(&ExternalRegistryExtensionLoader::LoadFinished, this));
+      base::Bind(&ExternalRegistryLoader::LoadFinished, this));
 }
+
+}  // namespace extensions