Moved ExternalExtensionLoaders/Providers into extensions namespace

chrome/browser/extensions/external_pref_extension_loader.cc

Index: chrome/browser/extensions/external_pref_extension_loader.cc
diff --git a/chrome/browser/extensions/external_pref_extension_loader.cc b/chrome/browser/extensions/external_pref_extension_loader.cc
deleted file mode 100644
index 40fcf4c97b207077fe876901ab23d4095135ded1..0000000000000000000000000000000000000000
--- a/chrome/browser/extensions/external_pref_extension_loader.cc
+++ /dev/null
@@ -1,253 +0,0 @@
-// 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_pref_extension_loader.h"
-
-#include "base/bind.h"
-#include "base/file_path.h"
-#include "base/file_util.h"
-#include "base/json/json_file_value_serializer.h"
-#include "base/json/json_string_value_serializer.h"
-#include "base/logging.h"
-#include "base/metrics/histogram.h"
-#include "base/path_service.h"
-#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
-#include "chrome/common/chrome_paths.h"
-#include "content/public/browser/browser_thread.h"
-
-using content::BrowserThread;
-
-namespace {
-
-FilePath::CharType kExternalExtensionJson[] =
-    FILE_PATH_LITERAL("external_extensions.json");
-
-std::set<FilePath> GetPrefsCandidateFilesFromFolder(
-      const FilePath& external_extension_search_path) {
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-
-  std::set<FilePath> external_extension_paths;
-
-  if (!file_util::PathExists(external_extension_search_path)) {
-    // Does not have to exist.
-    return external_extension_paths;
-  }
-
-  file_util::FileEnumerator json_files(
-      external_extension_search_path,
-      false,  // Recursive.
-      file_util::FileEnumerator::FILES);
-#if defined(OS_WIN)
-  FilePath::StringType extension = UTF8ToWide(std::string(".json"));
-#elif defined(OS_POSIX)
-  FilePath::StringType extension(".json");
-#endif
-  do {
-    FilePath file = json_files.Next();
-    if (file.BaseName().value() == kExternalExtensionJson)
-      continue;  // Already taken care of elsewhere.
-    if (file.empty())
-      break;
-    if (file.MatchesExtension(extension)) {
-      external_extension_paths.insert(file.BaseName());
-    } else {
-      DVLOG(1) << "Not considering: " << file.LossyDisplayName()
-               << " (does not have a .json extension)";
-    }
-  } while (true);
-
-  return external_extension_paths;
-}
-
-// Extracts extension information from a json file serialized by |serializer|.
-// |path| is only used for informational purposes (outputted when an error
-// occurs). An empty dictionary is returned in case of failure (e.g. invalid
-// path or json content).
-// Caller takes ownership of the returned dictionary.
-DictionaryValue* ExtractExtensionPrefs(base::ValueSerializer* serializer,
-                                       const FilePath& path) {
-  std::string error_msg;
-  Value* extensions = serializer->Deserialize(NULL, &error_msg);
-  if (!extensions) {
-    LOG(WARNING) << "Unable to deserialize json data: " << error_msg
-                 << " in file " << path.value() << ".";
-    return new DictionaryValue;
-  }
-
-  DictionaryValue* ext_dictionary = NULL;
-  if (extensions->GetAsDictionary(&ext_dictionary))
-    return ext_dictionary;
-
-  LOG(WARNING) << "Expected a JSON dictionary in file "
-               << path.value() << ".";
-  return new DictionaryValue;
-}
-
-}  // namespace
-
-ExternalPrefExtensionLoader::ExternalPrefExtensionLoader(int base_path_id,
-                                                         Options options)
-    : base_path_id_(base_path_id),
-      options_(options) {
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-}
-
-const FilePath ExternalPrefExtensionLoader::GetBaseCrxFilePath() {
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  // |base_path_| was set in LoadOnFileThread().
-  return base_path_;
-}
-
-void ExternalPrefExtensionLoader::StartLoading() {
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  BrowserThread::PostTask(
-      BrowserThread::FILE, FROM_HERE,
-      base::Bind(&ExternalPrefExtensionLoader::LoadOnFileThread, this));
-}
-
-void ExternalPrefExtensionLoader::LoadOnFileThread() {
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-
-  // TODO(skerner): Some values of base_path_id_ will cause
-  // PathService::Get() to return false, because the path does
-  // not exist.  Find and fix the build/install scripts so that
-  // this can become a CHECK().  Known examples include chrome
-  // OS developer builds and linux install packages.
-  // Tracked as crbug.com/70402 .
-  if (!PathService::Get(base_path_id_, &base_path_))
-    return;
-
-  scoped_ptr<DictionaryValue> prefs(new DictionaryValue);
-
-  ReadExternalExtensionPrefFile(prefs.get());
-  if (!prefs->empty())
-    LOG(WARNING) << "You are using an old-style extension deployment method "
-                    "(external_extensions.json), which will soon be "
-                    "deprecated. (see http://code.google.com/chrome/"
-                    "extensions/external_extensions.html )";
-
-  ReadStandaloneExtensionPrefFiles(prefs.get());
-
-  prefs_.swap(prefs);
-  if (!prefs_.get())
-    prefs_.reset(new DictionaryValue());
-
-  if (base_path_id_ == chrome::DIR_EXTERNAL_EXTENSIONS) {
-    UMA_HISTOGRAM_COUNTS_100("Extensions.ExternalJsonCount",
-                             prefs_->size());
-  }
-
-  // If we have any records to process, then we must have
-  // read at least one .json file.  If so, then we should have
-  // set |base_path_|.
-  if (!prefs_->empty())
-    CHECK(!base_path_.empty());
-
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(&ExternalPrefExtensionLoader::LoadFinished, this));
-}
-
-void ExternalPrefExtensionLoader::ReadExternalExtensionPrefFile(
-      DictionaryValue* prefs) {
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  CHECK(NULL != prefs);
-
-  FilePath json_file = base_path_.Append(kExternalExtensionJson);
-
-  if (!file_util::PathExists(json_file)) {
-    // This is not an error.  The file does not exist by default.
-    return;
-  }
-
-  if (IsOptionSet(ENSURE_PATH_CONTROLLED_BY_ADMIN)) {
-#if defined(OS_MACOSX)
-    if (!file_util::VerifyPathControlledByAdmin(json_file)) {
-      LOG(ERROR) << "Can not read external extensions source.  The file "
-                 << json_file.value() << " and every directory in its path, "
-                 << "must be owned by root, have group \"admin\", and not be "
-                 << "writable by all users. These restrictions prevent "
-                 << "unprivleged users from making chrome install extensions "
-                 << "on other users' accounts.";
-      return;
-    }
-#else
-    // The only platform that uses this check is Mac OS.  If you add one,
-    // you need to implement file_util::VerifyPathControlledByAdmin() for
-    // that platform.
-    NOTREACHED();
-#endif  // defined(OS_MACOSX)
-  }
-
-  JSONFileValueSerializer serializer(json_file);
-  scoped_ptr<DictionaryValue> ext_prefs(
-      ExtractExtensionPrefs(&serializer, json_file));
-  if (ext_prefs.get())
-    prefs->MergeDictionary(ext_prefs.get());
-}
-
-void ExternalPrefExtensionLoader::ReadStandaloneExtensionPrefFiles(
-      DictionaryValue* prefs) {
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  CHECK(NULL != prefs);
-
-  // First list the potential .json candidates.
-  std::set<FilePath>
-      candidates = GetPrefsCandidateFilesFromFolder(base_path_);
-  if (candidates.empty()) {
-    DVLOG(1) << "Extension candidates list empty";
-    return;
-  }
-
-  // For each file read the json description & build the proper
-  // associated prefs.
-  for (std::set<FilePath>::const_iterator it = candidates.begin();
-       it != candidates.end();
-       ++it) {
-    FilePath extension_candidate_path = base_path_.Append(*it);
-
-    std::string id =
-#if defined(OS_WIN)
-        WideToASCII(
-            extension_candidate_path.RemoveExtension().BaseName().value());
-#elif defined(OS_POSIX)
-        extension_candidate_path.RemoveExtension().BaseName().value().c_str();
-#endif
-
-    DVLOG(1) << "Reading json file: "
-             << extension_candidate_path.LossyDisplayName().c_str();
-
-    JSONFileValueSerializer serializer(extension_candidate_path);
-    scoped_ptr<DictionaryValue> ext_prefs(
-        ExtractExtensionPrefs(&serializer, extension_candidate_path));
-    if (ext_prefs.get()) {
-      DVLOG(1) << "Adding extension with id: " << id;
-      prefs->Set(id, ext_prefs.release());
-    }
-  }
-}
-
-ExternalTestingExtensionLoader::ExternalTestingExtensionLoader(
-    const std::string& json_data,
-    const FilePath& fake_base_path)
-    : fake_base_path_(fake_base_path) {
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  JSONStringValueSerializer serializer(json_data);
-  FilePath fake_json_path = fake_base_path.AppendASCII("fake.json");
-  testing_prefs_.reset(ExtractExtensionPrefs(&serializer, fake_json_path));
-}
-
-void ExternalTestingExtensionLoader::StartLoading() {
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  prefs_.reset(testing_prefs_->DeepCopy());
-  LoadFinished();
-}
-
-ExternalTestingExtensionLoader::~ExternalTestingExtensionLoader() {}
-
-const FilePath ExternalTestingExtensionLoader::GetBaseCrxFilePath() {
-  return fake_base_path_;
-}