Enabling CRLSet for ChromeOS

chrome/browser/chrome_browser_main.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/chrome_browser_main.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 383 matching lines @@
   RegisterSwiftShaderComponent(cus);
   g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(
       cus, command_line);
   RegisterWidevineCdmComponent(cus);
 #endif
 
 #if defined(CLD_DATA_FROM_COMPONENT)
   RegisterCldComponent(cus);
 #endif
 
-#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
+#if defined(OS_ANDROID)
+  // The CRLSet component was enabled for some releases. This code attempts to
+  // delete it from the local disk of those how may have downloaded it.
+  g_browser_process->crl_set_fetcher()->DeleteFromDisk();
+#else
   // CRLSetFetcher attempts to load a CRL set from either the local disk or
   // network.
   g_browser_process->crl_set_fetcher()->StartInitialLoad(cus);

[xiyuan, 2014/07/15 07:45:43]

The initial load should probably happen after the primary user is logged in.
Since we don't seem to need the profile, we could do the initial load in
UserManagerImpl::UserLoggedIn.

https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/chr...

If we have to register with |cus| here, then maybe split the registration part
and do it here for ChromeOS but move the initial load to the suggested place.

-#elif defined(OS_ANDROID)
-  // The CRLSet component was enabled for some releases. This code attempts to
-  // delete it from the local disk of those how may have downloaded it.
-  g_browser_process->crl_set_fetcher()->DeleteFromDisk();
 #endif
 
 #if defined(OS_WIN)
   ExecutePendingSwReporter(cus, g_browser_process->local_state());
 #endif
 
   cus->Start();
 }
 
 #if !defined(OS_ANDROID)
@@ skipping 1237 matching lines @@
   chromeos::CrosSettings::Shutdown();
 #endif
 #endif
 }
 
 // Public members:
 
 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
   chrome_extra_parts_.push_back(parts);
 }