| Index: chrome/browser/profiles/profile_io_data.cc
|
| diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
|
| index 8caf7f39de4e63054fc085b2013d80cd784aff0a..1d6637d906cee27302cd8d8d925c4ce17763f2ee 100644
|
| --- a/chrome/browser/profiles/profile_io_data.cc
|
| +++ b/chrome/browser/profiles/profile_io_data.cc
|
| @@ -88,11 +88,11 @@
|
|
|
| #if defined(OS_CHROMEOS)
|
| #include "chrome/browser/chromeos/drive/drive_protocol_handler.h"
|
| +#include "chrome/browser/chromeos/policy/network_policy_service.h"
|
| +#include "chrome/browser/chromeos/policy/network_policy_service_factory.h"
|
| #include "chrome/browser/chromeos/policy/policy_cert_verifier.h"
|
| #include "chrome/browser/chromeos/settings/cros_settings.h"
|
| #include "chrome/browser/chromeos/settings/cros_settings_names.h"
|
| -#include "chrome/browser/policy/profile_policy_connector.h"
|
| -#include "chrome/browser/policy/profile_policy_connector_factory.h"
|
| #endif // defined(OS_CHROMEOS)
|
|
|
| using content::BrowserContext;
|
| @@ -226,16 +226,17 @@ class DebugDevToolsInterceptor
|
| #if defined(OS_CHROMEOS)
|
| scoped_ptr<policy::PolicyCertVerifier> CreatePolicyCertVerifier(
|
| Profile* profile) {
|
| - policy::ProfilePolicyConnector* connector =
|
| - policy::ProfilePolicyConnectorFactory::GetForProfile(profile);
|
| + policy::NetworkPolicyService* service =
|
| + policy::NetworkPolicyServiceFactory::GetForProfile(profile);
|
| + DCHECK(service);
|
| base::Closure policy_cert_trusted_callback =
|
| base::Bind(base::IgnoreResult(&content::BrowserThread::PostTask),
|
| content::BrowserThread::UI,
|
| FROM_HERE,
|
| - connector->GetPolicyCertTrustedCallback());
|
| + service->GetPolicyCertTrustedCallback());
|
| scoped_ptr<policy::PolicyCertVerifier> cert_verifier(
|
| new policy::PolicyCertVerifier(policy_cert_trusted_callback));
|
| - connector->SetPolicyCertVerifier(cert_verifier.get());
|
| + service->SetPolicyCertVerifier(cert_verifier.get());
|
| return cert_verifier.Pass();
|
| }
|
| #endif
|
|
|