| Index: chrome/browser/plugins/plugins_resource_service.cc
|
| diff --git a/chrome/browser/web_resource/plugins_resource_service.cc b/chrome/browser/plugins/plugins_resource_service.cc
|
| similarity index 86%
|
| rename from chrome/browser/web_resource/plugins_resource_service.cc
|
| rename to chrome/browser/plugins/plugins_resource_service.cc
|
| index e6df0fd8dbd0419a39cd9d591480ef6beb13a02c..5ac41bf0649eb608721dec9d4c612db805abfca9 100644
|
| --- a/chrome/browser/web_resource/plugins_resource_service.cc
|
| +++ b/chrome/browser/plugins/plugins_resource_service.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/web_resource/plugins_resource_service.h"
|
| +#include "chrome/browser/plugins/plugins_resource_service.h"
|
|
|
| #include "base/command_line.h"
|
| #include "chrome/browser/plugins/plugin_finder.h"
|
| @@ -38,7 +38,7 @@ GURL GetPluginsServerURL() {
|
| #elif defined(OS_MACOSX)
|
| filename = "plugins_mac.json";
|
| #else
|
| - NOTREACHED();
|
| +#error Unknown platform
|
| #endif
|
|
|
| std::string test_url =
|
| @@ -62,6 +62,13 @@ PluginsResourceService::PluginsResourceService(PrefService* local_state)
|
| GetCacheUpdateDelay()) {
|
| }
|
|
|
| +void PluginsResourceService::Init() {
|
| + const base::DictionaryValue* metadata =
|
| + prefs_->GetDictionary(prefs::kPluginsMetadata);
|
| + PluginFinder::GetInstance()->ReinitializePlugins(metadata);
|
| + StartAfterDelay();
|
| +}
|
| +
|
| PluginsResourceService::~PluginsResourceService() {
|
| }
|
|
|
| @@ -74,5 +81,5 @@ void PluginsResourceService::RegisterPrefs(PrefRegistrySimple* registry) {
|
|
|
| void PluginsResourceService::Unpack(const DictionaryValue& parsed_json) {
|
| prefs_->Set(prefs::kPluginsMetadata, parsed_json);
|
| - PluginFinder::GetInstance()->ReinitializePlugins(parsed_json);
|
| + PluginFinder::GetInstance()->ReinitializePlugins(&parsed_json);
|
| }
|
|
|