| Index: chrome/browser/ui/browser_init.cc
|
| diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc
|
| index 4db2cb5ce3409384d3e66212fded693813355b98..68814ef37b040a9311e35e6ff3a29bee14313604 100644
|
| --- a/chrome/browser/ui/browser_init.cc
|
| +++ b/chrome/browser/ui/browser_init.cc
|
| @@ -527,7 +527,7 @@ void RecordAppLaunches(
|
| }
|
| }
|
|
|
| -void RegisterComponentsForUpdate() {
|
| +void RegisterComponentsForUpdate(const CommandLine& command_line) {
|
| ComponentUpdateService* cus = g_browser_process->component_updater();
|
| if (!cus)
|
| return;
|
| @@ -538,10 +538,10 @@ void RegisterComponentsForUpdate() {
|
| 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();
|
| }
|
| @@ -1397,7 +1397,7 @@ bool BrowserInit::ProcessCmdLineImpl(const CommandLine& command_line,
|
| 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)) {
|
|
|