Fix cyclic dependency between ProfilePolicyConnector and PrefService.

chrome/browser/ui/webui/options/certificate_manager_handler.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/ui/webui/options/certificate_manager_handler.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 15 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #include "net/base/crypto_module.h"
 #include "net/base/net_errors.h"
 #include "net/cert/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/policy/profile_policy_connector.h"
-#include "chrome/browser/policy/profile_policy_connector_factory.h"
+#include "chrome/browser/chromeos/policy/network_policy_service.h"
+#include "chrome/browser/chromeos/policy/network_policy_service_factory.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #endif
 
 using content::BrowserThread;
 
 namespace {
 
 static const char kKeyId[] = "id";
 static const char kSubNodesId[] = "subnodes";
@@ skipping 435 matching lines @@
   web_ui()->RegisterMessageCallback(
       "checkTpmTokenReady",
       base::Bind(&CertificateManagerHandler::CheckTpmTokenReady,
                  base::Unretained(this)));
 #endif
 }
 
 void CertificateManagerHandler::CertificatesRefreshed() {
   net::CertificateList web_trusted_certs;
 #if defined(OS_CHROMEOS)
-  policy::ProfilePolicyConnectorFactory::GetForProfile(
+  policy::NetworkPolicyServiceFactory::GetForProfile(
       Profile::FromWebUI(web_ui()))->GetWebTrustedCertificates(
           &web_trusted_certs);
 #endif
   PopulateTree("personalCertsTab", net::USER_CERT, web_trusted_certs);
   PopulateTree("serverCertsTab", net::SERVER_CERT, web_trusted_certs);
   PopulateTree("caCertsTab", net::CA_CERT, web_trusted_certs);
   PopulateTree("otherCertsTab", net::OTHER_CERT, web_trusted_certs);
 }
 
 void CertificateManagerHandler::FileSelected(const base::FilePath& path,
@@ skipping 614 matching lines @@
   web_ui()->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady",
                                    ready);
 }
 #endif
 
 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const {
   return web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow();
 }
 
 }  // namespace options