Revert of Implemented consumer management unenrollment.

chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_H_
 #define CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 16 matching lines @@
 namespace content {
 class WebUI;
 }
 
 namespace ownership {
 class OwnerKeyUtil;
 }
 
 namespace chromeos {
 
-class FakeOwnerSettingsService;
-
 // The class is a profile-keyed service which holds public/private
 // keypair corresponds to a profile. The keypair is reloaded automatically when
 // profile is created and TPM token is ready. Note that the private part of a
 // key can be loaded only for the owner.
 //
 // TODO (ygorshenin@): move write path for device settings here
 // (crbug.com/230018).
 class OwnerSettingsServiceChromeOS : public ownership::OwnerSettingsService,
                                      public content::NotificationObserver,
                                      public SessionManagerClient::Observer,
@@ skipping 34 matching lines @@
 
   // SessionManagerClient::Observer:
   virtual void OwnerKeySet(bool success) override;
 
   // DeviceSettingsService::Observer:
   virtual void OwnershipStatusChanged() override;
   virtual void DeviceSettingsUpdated() override;
   virtual void OnDeviceSettingsServiceShutdown() override;
 
   // Sets the management related settings.
-  virtual void SetManagementSettings(
-      const ManagementSettings& settings,
-      const OnManagementSettingsSetCallback& callback);
+  void SetManagementSettings(const ManagementSettings& settings,
+                             const OnManagementSettingsSetCallback& callback);
 
   // Checks if the user is the device owner, without the user profile having to
   // been initialized. Should be used only if login state is in safe mode.
   static void IsOwnerForSafeModeAsync(
       const std::string& user_hash,
       const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util,
       const IsOwnerCallback& callback);
 
   // Assembles PolicyData based on |settings|, |policy_data| and
   // |user_id|.
   static scoped_ptr<enterprise_management::PolicyData> AssemblePolicy(
       const std::string& user_id,
       const enterprise_management::PolicyData* policy_data,
       const enterprise_management::ChromeDeviceSettingsProto* settings);
 
   // Updates device |settings|.
   static void UpdateDeviceSettings(
       const std::string& path,
       const base::Value& value,
       enterprise_management::ChromeDeviceSettingsProto& settings);
 
   bool has_pending_changes() const {
     return !pending_changes_.empty() || tentative_settings_.get() ||
            has_pending_management_settings_;
   }
 
- protected:
+ private:
+  friend class OwnerSettingsServiceChromeOSFactory;
+
   OwnerSettingsServiceChromeOS(
       DeviceSettingsService* device_settings_service,
       Profile* profile,
       const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util);
 
- private:
-  friend class OwnerSettingsServiceChromeOSFactory;
-
   // OwnerSettingsService protected interface overrides:
 
   // Reloads private key from profile's NSS slots, responds via |callback|.
   virtual void ReloadKeypairImpl(const base::Callback<
       void(const scoped_refptr<ownership::PublicKey>& public_key,
            const scoped_refptr<ownership::PrivateKey>& private_key)>& callback)
       override;
 
   // Possibly notifies DeviceSettingsService that owner's keypair is loaded.
   virtual void OnPostKeypairLoadedActions() override;
@@ skipping 51 matching lines @@
   base::WeakPtrFactory<OwnerSettingsServiceChromeOS> weak_factory_;
 
   base::WeakPtrFactory<OwnerSettingsServiceChromeOS> store_settings_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OwnerSettingsServiceChromeOS);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_H_