Introduces an additional extension loader that load extra extensions based on per-extension json fi…

chrome/browser/extensions/external_pref_extension_loader.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_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 "chrome/browser/extensions/external_extension_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
-namespace {
-
-// Caller takes ownership of the returned dictionary.
-DictionaryValue* ExtractPrefs(const FilePath& path,
-                              base::ValueSerializer* serializer) {
-  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() << " .";
-  } else {
-    if (!extensions->IsType(Value::TYPE_DICTIONARY)) {
-      LOG(WARNING) << "Expected a JSON dictionary in file "
-                   << path.value() << " .";
-    } else {
-      return static_cast<DictionaryValue*>(extensions);
-    }
-  }
-  return new DictionaryValue;
-}
-
-}  // namespace
-
 ExternalPrefExtensionLoader::ExternalPrefExtensionLoader(int base_path_key,
                                                          Options options)
     : base_path_key_(base_path_key),
       options_(options){
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 const FilePath ExternalPrefExtensionLoader::GetBaseCrxFilePath() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ skipping 40 matching lines @@
     }
 #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);
-  DictionaryValue* parsed_json_prefs = ExtractPrefs(json_file, &serializer);
-  return parsed_json_prefs;
+  DictionaryValue*
+      json_prefs = ExternalExtensionUtil::ExtractPrefs(json_file, &serializer);
+  return json_prefs;
 }
 
 void ExternalPrefExtensionLoader::LoadOnFileThread() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   prefs_.reset(ReadJsonPrefsFile());
   if (!prefs_.get())
     prefs_.reset(new DictionaryValue());
 
   if (base_path_key_ == chrome::DIR_EXTERNAL_EXTENSIONS) {
@@ skipping 12 matching lines @@
       base::Bind(&ExternalPrefExtensionLoader::LoadFinished, this));
 }
 
 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(ExtractPrefs(fake_json_path, &serializer));
+  testing_prefs_.reset(ExternalExtensionUtil::ExtractPrefs(fake_json_path

[Sam Kerner (Chrome), 2012/04/13 19:35:13]

Coma should be on previous line.

[Alexandre Abreu, 2012/04/13 21:52:38]

Done.

+                                                          , &serializer));
 }
 
 void ExternalTestingExtensionLoader::StartLoading() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   prefs_.reset(testing_prefs_->DeepCopy());
   LoadFinished();
 }
 
 ExternalTestingExtensionLoader::~ExternalTestingExtensionLoader() {}
 
 const FilePath ExternalTestingExtensionLoader::GetBaseCrxFilePath() {
   return fake_base_path_;
 }