Revert of Added affiliation IDs for the new affiliation determination.

chrome/browser/chromeos/policy/browser_policy_connector_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_POLICY_BROWSER_POLICY_CONNECTOR_CHROMEOS_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_BROWSER_POLICY_CONNECTOR_CHROMEOS_H_
 
-#include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/login/users/affiliation.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/policy/chrome_browser_policy_connector.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 
 class PrefRegistrySimple;
 class PrefService;
 
 namespace net {
 class URLRequestContextGetter;
 }
@@ skipping 32 matching lines @@
   // connection to these dependencies to be severed earlier.
   void PreShutdown();
 
   void Shutdown() override;
 
   // Returns true if this device is managed by an enterprise (as opposed to
   // a local owner).
   bool IsEnterpriseManaged();
 
   // Returns the enterprise domain if device is managed.
-  std::string GetEnterpriseDomain() const;
+  std::string GetEnterpriseDomain();
 
   // Returns the device asset ID if it is set.
   std::string GetDeviceAssetID();
 
   // Returns the device mode. For ChromeOS this function will return the mode
   // stored in the lockbox, or DEVICE_MODE_CONSUMER if the lockbox has been
   // locked empty, or DEVICE_MODE_UNKNOWN if the device has not been owned yet.
   // For other OSes the function will always return DEVICE_MODE_CONSUMER.
   DeviceMode GetDeviceMode();
 
@@ skipping 60 matching lines @@
       EnterpriseInstallAttributes* attributes);
   static void RemoveInstallAttributesForTesting();
 
   // Registers device refresh rate pref.
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
   // DeviceCloudPolicyManagerChromeOS::Observer:
   void OnDeviceCloudPolicyManagerConnected() override;
   void OnDeviceCloudPolicyManagerDisconnected() override;
 
-  chromeos::AffiliationIDSet GetDeviceAffiliationIDs() const;
-
  private:
   // Set the timezone as soon as the policies are available.
   void SetTimezoneIfPolicyAvailable();
 
   // Restarts the device cloud policy initializer, because the device's
   // registration status changed from registered to unregistered.
   void RestartDeviceCloudPolicyInitializer();
 
   // Components of the device cloud policy implementation.
   scoped_ptr<ServerBackedStateKeysBroker> state_keys_broker_;
@@ skipping 22 matching lines @@
   scoped_ptr<NetworkConfigurationUpdater> network_configuration_updater_;
 
   base::WeakPtrFactory<BrowserPolicyConnectorChromeOS> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPolicyConnectorChromeOS);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_BROWSER_POLICY_CONNECTOR_CHROMEOS_H_