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 381 matching lines @@
   RegisterPepperFlashComponent(cus);
   RegisterSwiftShaderComponent(cus);
   g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(cus);
   RegisterWidevineCdmComponent(cus);
 #endif
 
 #if defined(CLD_DATA_FROM_COMPONENT)
   RegisterCldComponent(cus);
 #endif
 
+  base::FilePath path;
+  if (PathService::Get(chrome::DIR_USER_DATA, &path)) {
 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)

[Lei Zhang, 2014/07/22 23:40:42]

I realize you didn't originally write this, but since you are going to touch all
these lines anyway, you can slightly simplify the #ifdefs:

#if defined(OS_ANDROID)
...
#elif !defined(OS_CHROMEOS)
...
#endif

-  // CRLSetFetcher attempts to load a CRL set from either the local disk or
-  // network.
-  g_browser_process->crl_set_fetcher()->StartInitialLoad(cus);
+    // CRLSetFetcher attempts to load a CRL set from either the local disk or
+    // network.
+    // For Chrome OS this registration is delayed until user login.
+    g_browser_process->crl_set_fetcher()->StartInitialLoad(cus, path);
 #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();
+    // 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(path);
 #endif
+  }
 
 #if defined(OS_WIN)
   ExecutePendingSwReporter(cus, g_browser_process->local_state());
 #endif
 
   cus->Start();
 }
 
 #if !defined(OS_ANDROID)
 bool ProcessSingletonNotificationCallback(
@@ skipping 1228 matching lines @@
   chromeos::CrosSettings::Shutdown();
 #endif
 #endif
 }
 
 // Public members:
 
 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
   chrome_extra_parts_.push_back(parts);
 }