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

chrome/browser/certificate_manager_model.cc

Index: chrome/browser/certificate_manager_model.cc
diff --git a/chrome/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc
index f4cbb0f34cc6a8c314fb2e0fe18e1146dd789bec..d3c3ebf3e714312ef91b10bf3b8d1d8107bf6933 100644
--- a/chrome/browser/certificate_manager_model.cc
+++ b/chrome/browser/certificate_manager_model.cc
@@ -12,9 +12,6 @@
 #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"
@@ -27,6 +24,15 @@
 #include "net/cert/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 
+// TODO(wychen): ChromeOS headers should only be included when building
+//               ChromeOS, and the following headers should be guarded by
+//               #if defined(OS_CHROMEOS). However, the types are actually
+//               used, and it takes another CL to clean them up.
+//               Reference: crbug.com/720159
+#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