Clean up most of the ChromeOS headers in non-ChromeOS build

chrome/browser/certificate_manager_model.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/certificate_manager_model.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
-#include "chrome/browser/chromeos/certificate_provider/certificate_provider.h"
-#include "chrome/browser/chromeos/certificate_provider/certificate_provider_service.h"
-#include "chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.h"
 #include "chrome/browser/net/nss_context.h"
 #include "chrome/browser/ui/crypto_module_password_dialog_nss.h"
 #include "chrome/common/net/x509_certificate_model.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_context.h"
 #include "crypto/nss_util.h"
 #include "net/base/net_errors.h"
 #include "net/cert/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 
+// TODO: should be guarded by #if defined(OS_CHROMEOS)

[Nico, 2017/05/02 20:49:21]

TODOs should be annotated with a name: TODO(wychen) (doesn't mean you have to do
it, just means you're a good point of contact)

[wychen, 2017/05/02 21:57:24]

Done.

+#include "chrome/browser/chromeos/certificate_provider/certificate_provider.h"
+#include "chrome/browser/chromeos/certificate_provider/certificate_provider_service.h"
+#include "chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.h"
+
 using content::BrowserThread;
 
 // CertificateManagerModel is created on the UI thread. It needs a
 // NSSCertDatabase handle (and on ChromeOS it needs to get the TPM status) which
 // needs to be done on the IO thread.
 //
 // The initialization flow is roughly:
 //
 //               UI thread                              IO Thread
 //
@@ skipping 279 matching lines @@
   net::NSSCertDatabase* cert_db = GetNSSCertDatabaseForResourceContext(
       context, did_get_cert_db_callback);
 
   // The callback is run here instead of the actual function call because of
   // extension_certificate_provider ownership semantics, ie. ownership can only
   // be released once. The callback will only be run once (either inside the
   // function above or here).
   if (cert_db)
     did_get_cert_db_callback.Run(cert_db);
 }