policy: Remove unused private fields

BUG=447445

Review URL: https://codereview.chromium.org/849793002

Cr-Commit-Position: refs/heads/master@{#311255}

10 files changed, 7 insertions, 28 deletions

diff --git a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
index a329ba0..d21ca9a 100644
--- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
+++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
@@ -181,8 +181,7 @@ void BrowserPolicyConnectorChromeOS::Init(
             install_attributes_.get(),
             state_keys_broker_.get(),
             device_cloud_policy_manager_->device_store(),
-            device_cloud_policy_manager_,
-            chromeos::DeviceSettingsService::Get()));
+            device_cloud_policy_manager_));
     device_cloud_policy_initializer_->Init();
   }
 
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
index 4131ff9..124a716 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
@@ -20,7 +20,6 @@
 #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h"
 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
 #include "chrome/browser/chromeos/policy/server_backed_device_state.h"
-#include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/system/statistics_provider.h"
@@ -55,8 +54,7 @@ DeviceCloudPolicyInitializer::DeviceCloudPolicyInitializer(
     EnterpriseInstallAttributes* install_attributes,
     ServerBackedStateKeysBroker* state_keys_broker,
     DeviceCloudPolicyStoreChromeOS* device_store,
-    DeviceCloudPolicyManagerChromeOS* manager,
-    chromeos::DeviceSettingsService* device_settings_service)
+    DeviceCloudPolicyManagerChromeOS* manager)
     : local_state_(local_state),
       enterprise_service_(enterprise_service),
       consumer_service_(consumer_service),
@@ -65,7 +63,6 @@ DeviceCloudPolicyInitializer::DeviceCloudPolicyInitializer(
       state_keys_broker_(state_keys_broker),
       device_store_(device_store),
       manager_(manager),
-      device_settings_service_(device_settings_service),
       is_initialized_(false) {
 }
 
@@ -108,7 +105,7 @@ void DeviceCloudPolicyInitializer::StartEnrollment(
   manager_->core()->Disconnect();
   enrollment_handler_.reset(new EnrollmentHandlerChromeOS(
       device_store_, install_attributes_, state_keys_broker_,
-      device_settings_service_, owner_settings_service,
+      owner_settings_service,
       CreateClient(device_management_service), background_task_runner_,
       enrollment_config, auth_token, install_attributes_->GetDeviceId(),
       manager_->GetDeviceRequisition(), allowed_device_modes, management_mode,
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h
index 95ffe64..8cd3025 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h
@@ -25,7 +25,6 @@ class SequencedTaskRunner;
 }
 
 namespace chromeos {
-class DeviceSettingsService;
 class OwnerSettingsServiceChromeOS;
 }
 
@@ -56,8 +55,7 @@ class DeviceCloudPolicyInitializer : public CloudPolicyStore::Observer {
       EnterpriseInstallAttributes* install_attributes,
       ServerBackedStateKeysBroker* state_keys_broker,
       DeviceCloudPolicyStoreChromeOS* device_store,
-      DeviceCloudPolicyManagerChromeOS* manager,
-      chromeos::DeviceSettingsService* device_settings_service);
+      DeviceCloudPolicyManagerChromeOS* manager);
 
   virtual ~DeviceCloudPolicyInitializer();
 
@@ -115,7 +113,6 @@ class DeviceCloudPolicyInitializer : public CloudPolicyStore::Observer {
   ServerBackedStateKeysBroker* state_keys_broker_;
   DeviceCloudPolicyStoreChromeOS* device_store_;
   DeviceCloudPolicyManagerChromeOS* manager_;
-  chromeos::DeviceSettingsService* device_settings_service_;
   bool is_initialized_;
 
   // Non-NULL if there is an enrollment operation pending.
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_initializer_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_initializer_unittest.cc
index 0ee94b6..fcafd33 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_initializer_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_initializer_unittest.cc
@@ -28,7 +28,6 @@ class DeviceCloudPolicyInitializerTest : public testing::Test {
             &install_attributes_,
             nullptr,
             nullptr,
-            nullptr,
             nullptr) {
     chrome::RegisterLocalState(local_state_.registry());
     statistics_provider_.SetMachineStatistic("serial_number", "fake-serial");
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
index 8ebafde..a13be1b 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
@@ -181,8 +181,7 @@ class DeviceCloudPolicyManagerChromeOSTest
         install_attributes_.get(),
         &state_keys_broker_,
         store_,
-        manager_.get(),
-        &device_settings_service_));
+        manager_.get()));
     initializer_->Init();
   }
 
diff --git a/chrome/browser/chromeos/policy/device_status_collector.h b/chrome/browser/chromeos/policy/device_status_collector.h
index a84cdb5..a428804 100644
--- a/chrome/browser/chromeos/policy/device_status_collector.h
+++ b/chrome/browser/chromeos/policy/device_status_collector.h
@@ -160,9 +160,6 @@ class DeviceStatusCollector : public CloudPolicyClient::StatusProvider {
   void ReceiveVolumeInfo(
       const std::vector<enterprise_management::VolumeInfo>& info);
 
-  // How often to poll to see if the user is idle.
-  int poll_interval_seconds_;
-
   PrefService* local_state_;
 
   // The last time an idle state check was performed.
diff --git a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
index f1763c2..cf9c94b2 100644
--- a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
+++ b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
@@ -18,7 +18,6 @@
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h"
-#include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chromeos/chromeos_switches.h"
 #include "google_apis/gaia/gaia_urls.h"
@@ -71,7 +70,6 @@ EnrollmentHandlerChromeOS::EnrollmentHandlerChromeOS(
     DeviceCloudPolicyStoreChromeOS* store,
     EnterpriseInstallAttributes* install_attributes,
     ServerBackedStateKeysBroker* state_keys_broker,
-    chromeos::DeviceSettingsService* device_settings_service,
     chromeos::OwnerSettingsServiceChromeOS* owner_settings_service,
     scoped_ptr<CloudPolicyClient> client,
     scoped_refptr<base::SequencedTaskRunner> background_task_runner,
@@ -85,7 +83,6 @@ EnrollmentHandlerChromeOS::EnrollmentHandlerChromeOS(
     : store_(store),
       install_attributes_(install_attributes),
       state_keys_broker_(state_keys_broker),
-      device_settings_service_(device_settings_service),
       owner_settings_service_(owner_settings_service),
       client_(client.Pass()),
       background_task_runner_(background_task_runner),
diff --git a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h
index 726b1ae..f3125a8 100644
--- a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h
+++ b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h
@@ -27,7 +27,6 @@ class SequencedTaskRunner;
 }
 
 namespace chromeos {
-class DeviceSettingsService;
 class OwnerSettingsServiceChromeOS;
 }
 
@@ -66,7 +65,6 @@ class EnrollmentHandlerChromeOS : public CloudPolicyClient::Observer,
       DeviceCloudPolicyStoreChromeOS* store,
       EnterpriseInstallAttributes* install_attributes,
       ServerBackedStateKeysBroker* state_keys_broker,
-      chromeos::DeviceSettingsService* device_settings_service,
       chromeos::OwnerSettingsServiceChromeOS* owner_settings_service,
       scoped_ptr<CloudPolicyClient> client,
       scoped_refptr<base::SequencedTaskRunner> background_task_runner,
@@ -162,7 +160,6 @@ class EnrollmentHandlerChromeOS : public CloudPolicyClient::Observer,
   DeviceCloudPolicyStoreChromeOS* store_;
   EnterpriseInstallAttributes* install_attributes_;
   ServerBackedStateKeysBroker* state_keys_broker_;
-  chromeos::DeviceSettingsService* device_settings_service_;
   chromeos::OwnerSettingsServiceChromeOS* owner_settings_service_;
   scoped_ptr<CloudPolicyClient> client_;
   scoped_refptr<base::SequencedTaskRunner> background_task_runner_;
diff --git a/chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.cc b/chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.cc
index 11ac657..700cdd4 100644
--- a/chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.cc
+++ b/chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.cc
@@ -20,8 +20,7 @@ FakeDeviceCloudPolicyInitializer::FakeDeviceCloudPolicyInitializer()
           NULL,  // install_attributes
           NULL,  // state_keys_broker
           NULL,  // device_store
-          NULL,  // manager
-          NULL),  // device_settings_service
+          NULL),  // manager
       was_start_enrollment_called_(false),
       enrollment_status_(EnrollmentStatus::ForStatus(
           EnrollmentStatus::STATUS_SUCCESS)) {
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc
index f252624..6b531ca 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc
@@ -97,7 +97,6 @@ class LegacyPolicyCacheLoader : public UserPolicyTokenLoader::Delegate,
 
   std::string dm_token_;
   std::string device_id_;
-  bool has_policy_;
   scoped_ptr<em::PolicyFetchResponse> policy_;
   CloudPolicyStore::Status status_;
 
@@ -112,8 +111,7 @@ LegacyPolicyCacheLoader::LegacyPolicyCacheLoader(
     const base::FilePath& token_cache_file,
     const base::FilePath& policy_cache_file,
     scoped_refptr<base::SequencedTaskRunner> background_task_runner)
-    : has_policy_(false),
-      status_(CloudPolicyStore::STATUS_OK),
+    : status_(CloudPolicyStore::STATUS_OK),
       weak_factory_(this) {
   token_loader_ = new UserPolicyTokenLoader(weak_factory_.GetWeakPtr(),
                                             token_cache_file,