| Index: chrome/browser/plugins/plugins_resource_service.cc
|
| diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser/plugins/plugins_resource_service.cc
|
| index e1ac91a431c5122272eb3fd00a5c37cc50203232..d43526e0ab9ea7163ef33015109e6a0bc10e43c4 100644
|
| --- a/chrome/browser/plugins/plugins_resource_service.cc
|
| +++ b/chrome/browser/plugins/plugins_resource_service.cc
|
| @@ -19,16 +19,10 @@ const int kStartResourceFetchDelayMs = 60 * 1000;
|
|
|
| // Delay between calls to update the cache 1 day and 2 minutes in testing mode.
|
| const int kCacheUpdateDelayMs = 24 * 60 * 60 * 1000;
|
| -const int kTestCacheUpdateDelayMs = 2 * 60 * 1000;
|
|
|
| const char kPluginsServerUrl[] =
|
| "https://www.gstatic.com/chrome/config/plugins_2/";
|
|
|
| -bool IsTest() {
|
| - return base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kPluginsMetadataServerURL);
|
| -}
|
| -
|
| GURL GetPluginsServerURL() {
|
| std::string filename;
|
| #if defined(OS_WIN)
|
| @@ -41,14 +35,7 @@ GURL GetPluginsServerURL() {
|
| #error Unknown platform
|
| #endif
|
|
|
| - std::string test_url =
|
| - base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
|
| - switches::kPluginsMetadataServerURL);
|
| - return GURL(IsTest() ? test_url : kPluginsServerUrl + filename);
|
| -}
|
| -
|
| -int GetCacheUpdateDelay() {
|
| - return IsTest() ? kTestCacheUpdateDelayMs : kCacheUpdateDelayMs;
|
| + return GURL(kPluginsServerUrl + filename);
|
| }
|
|
|
| } // namespace
|
| @@ -59,7 +46,7 @@ PluginsResourceService::PluginsResourceService(PrefService* local_state)
|
| false,
|
| prefs::kPluginsResourceCacheUpdate,
|
| kStartResourceFetchDelayMs,
|
| - GetCacheUpdateDelay()) {
|
| + kCacheUpdateDelayMs) {
|
| }
|
|
|
| void PluginsResourceService::Init() {
|
|
|