| Index: chrome/browser/policy/profile_policy_connector.cc
|
| diff --git a/chrome/browser/policy/profile_policy_connector.cc b/chrome/browser/policy/profile_policy_connector.cc
|
| index 96812cc16b1ed1de3d68d94cf0eb471cb944bf7c..fcb1a68124eface048d3790872fdc21c47fcb2c9 100644
|
| --- a/chrome/browser/policy/profile_policy_connector.cc
|
| +++ b/chrome/browser/policy/profile_policy_connector.cc
|
| @@ -14,25 +14,20 @@
|
| #include "chrome/browser/policy/policy_service.h"
|
|
|
| #if defined(OS_CHROMEOS)
|
| -#include "base/bind.h"
|
| -#include "base/prefs/pref_service.h"
|
| #include "chrome/browser/chromeos/login/user.h"
|
| #include "chrome/browser/chromeos/login/user_manager.h"
|
| #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h"
|
| #include "chrome/browser/chromeos/policy/login_profile_policy_provider.h"
|
| #include "chrome/browser/policy/policy_service.h"
|
| -#include "chrome/common/pref_names.h"
|
| #endif
|
|
|
| namespace policy {
|
|
|
| -ProfilePolicyConnector::ProfilePolicyConnector(Profile* profile)
|
| - :
|
| +ProfilePolicyConnector::ProfilePolicyConnector()
|
| #if defined(OS_CHROMEOS)
|
| - is_primary_user_(false),
|
| - weak_ptr_factory_(this),
|
| + : is_primary_user_(false)
|
| #endif
|
| - profile_(profile) {}
|
| + {}
|
|
|
| ProfilePolicyConnector::~ProfilePolicyConnector() {}
|
|
|
| @@ -93,25 +88,6 @@ void ProfilePolicyConnector::Shutdown() {
|
| }
|
|
|
| #if defined(OS_CHROMEOS)
|
| -base::Closure ProfilePolicyConnector::GetPolicyCertTrustedCallback() {
|
| - return base::Bind(&ProfilePolicyConnector::SetUsedPolicyCertificatesOnce,
|
| - weak_ptr_factory_.GetWeakPtr());
|
| -}
|
| -#endif
|
| -
|
| -bool ProfilePolicyConnector::UsedPolicyCertificates() {
|
| -#if defined(OS_CHROMEOS)
|
| - return profile_->GetPrefs()->GetBoolean(prefs::kUsedPolicyCertificatesOnce);
|
| -#else
|
| - return false;
|
| -#endif
|
| -}
|
| -
|
| -#if defined(OS_CHROMEOS)
|
| -void ProfilePolicyConnector::SetUsedPolicyCertificatesOnce() {
|
| - profile_->GetPrefs()->SetBoolean(prefs::kUsedPolicyCertificatesOnce, true);
|
| -}
|
| -
|
| void ProfilePolicyConnector::InitializeDeviceLocalAccountPolicyProvider(
|
| const std::string& username) {
|
| BrowserPolicyConnector* connector =
|
|
|