net: enable CRL sets behind a command line flag.

chrome/browser/ui/browser_init.cc

 // Copyright (c) 2011 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/ui/browser_init.h"
 
 #include <algorithm>   // For max().
 
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 508 matching lines @@
   }
   for (size_t i = 0; i < autolaunch_tabs.size(); ++i) {
     if (extension_service->IsInstalledApp(autolaunch_tabs.at(i).url)) {
       UMA_HISTOGRAM_ENUMERATION(extension_misc::kAppLaunchHistogram,
                                 extension_misc::APP_LAUNCH_AUTOLAUNCH,
                                 extension_misc::APP_LAUNCH_BUCKET_BOUNDARY);
     }
   }
 }
 
-void RegisterComponentsForUpdate() {
+void RegisterComponentsForUpdate(const CommandLine& command_line) {
   ComponentUpdateService* cus = g_browser_process->component_updater();
   if (!cus)
     return;
   // Registration can be before of after cus->Start() so it is ok to post
   // a task to the UI thread to do registration once you done the necessary
   // file IO to know you existing component version.
   RegisterRecoveryComponent(cus, g_browser_process->local_state());
   RegisterPepperFlashComponent(cus);
   RegisterNPAPIFlashComponent(cus);
 
-  // CRLSetFetcher attempts to load a CRL set from either the local disk
-  // or network.
-  // TODO(agl): this is disabled for now while it's plumbed in.
-  // g_browser_process->crl_set_fetcher()->StartInitialLoad(cus);
+  // CRLSetFetcher attempts to load a CRL set from either the local disk or
+  // network.
+  if (command_line.HasSwitch(switches::kEnableCRLSets))
+    g_browser_process->crl_set_fetcher()->StartInitialLoad(cus);
 
   cus->Start();
 }
 
 }  // namespace
 
 
 // BrowserInit ----------------------------------------------------------------
 
 BrowserInit::BrowserInit() {}
@@ skipping 828 matching lines @@
                                      const FilePath& cur_dir,
                                      bool process_startup,
                                      Profile* profile,
                                      int* return_code,
                                      BrowserInit* browser_init) {
   DCHECK(profile);
   if (process_startup) {
     if (command_line.HasSwitch(switches::kDisablePromptOnRepost))
       NavigationController::DisablePromptOnRepost();
 
-    RegisterComponentsForUpdate();
+    RegisterComponentsForUpdate(command_line);
 
     // Look for the testing channel ID ONLY during process startup
     if (command_line.HasSwitch(switches::kTestingChannelID)) {
       std::string testing_channel_id = command_line.GetSwitchValueASCII(
           switches::kTestingChannelID);
       // TODO(sanjeevr) Check if we need to make this a singleton for
       // compatibility with the old testing code
       // If there are any extra parameters, we expect each one to generate a
       // new tab; if there are none then we get one homepage tab.
       int expected_tab_count = 1;
@@ skipping 125 matching lines @@
   if (!automation->InitializeChannel(channel_id))
     return false;
   automation->SetExpectedTabCount(expected_tabs);
 
   AutomationProviderList* list = g_browser_process->GetAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 
   return true;
 }