Revert of Added affiliation IDs for the new affiliation determination…

…. (patchset chromium#13 id:240001 of https://codereview.chromium.org/1266563002/)

Reason for revert:
Breaking the following build: Linux ChromiumOS Tests (1) Build #6802

https://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%281%29/builds/6802

Original issue's description:
> Added affiliation IDs, that in future will be used to determine user affiliation to the device. Added unit-test as well.
>
> BUG=491210
>
> Committed: https://crrev.com/2bd626caac141ef01a2396d232fb6391d23b1e79
> Cr-Commit-Position: refs/heads/master@{#341159}

TBR=mnissler@chromium.org,atwilson@chromium.org,dpolukhin@chromium.org,peletskyi@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=491210

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

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

chrome/browser/chromeos/login/users/chrome_user_manager.h

@@ -8,7 +8,6 @@
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/task_runner.h"
-#include "chrome/browser/chromeos/login/users/affiliation.h"
 #include "chrome/browser/chromeos/login/users/user_manager_interface.h"
 #include "components/user_manager/user_manager_base.h"
 
@@ -31,12 +30,6 @@ class ChromeUserManager : public user_manager::UserManagerBase,
   static user_manager::UserList GetUsersAllowedAsSupervisedUserManagers(
       const user_manager::UserList& user_list);
 
-  // Sets affiliation status for the user |user_id| judging by
-  // |user_affiliation_ids| and device affiliation IDs.
-  virtual void SetUserAffiliation(
-      const std::string& user_email,
-      const AffiliationIDSet& user_affiliation_ids) = 0;
-
   DISALLOW_COPY_AND_ASSIGN(ChromeUserManager);
 };
 

chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc

@@ -29,7 +29,6 @@
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/login/signin/auth_sync_observer.h"
 #include "chrome/browser/chromeos/login/signin/auth_sync_observer_factory.h"
-#include "chrome/browser/chromeos/login/users/affiliation.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h"
 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager_impl.h"
@@ -95,7 +94,6 @@ void ChromeUserManagerImpl::RegisterPrefs(PrefRegistrySimple* registry) {
 
   registry->RegisterListPref(kPublicAccounts);
   registry->RegisterStringPref(kPublicAccountPendingDataRemoval, std::string());
-
   SupervisedUserManager::RegisterPrefs(registry);
   SessionLengthLimiter::RegisterPrefs(registry);
   BootstrapManager::RegisterPrefs(registry);
@@ -1123,20 +1121,4 @@ void ChromeUserManagerImpl::UpdateUserTimeZoneRefresher(Profile* profile) {
   }
 }
 
-void ChromeUserManagerImpl::SetUserAffiliation(
-    const std::string& user_email,
-    const AffiliationIDSet& user_affiliation_ids) {
-  std::string canonicalized_email =
-      gaia::CanonicalizeEmail(gaia::SanitizeEmail(user_email));
-  user_manager::User* user = FindUserAndModify(canonicalized_email);
-
-  if (user) {
-    policy::BrowserPolicyConnectorChromeOS const* const connector =
-        g_browser_process->platform_part()->browser_policy_connector_chromeos();
-    user->set_affiliation(chromeos::IsUserAffiliated(
-        user_affiliation_ids, connector->GetDeviceAffiliationIDs(),
-        canonicalized_email, connector->GetEnterpriseDomain()));
-  }
-}
-
 }  // namespace chromeos

chrome/browser/chromeos/login/users/chrome_user_manager_impl.h

@@ -19,7 +19,6 @@
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.h"
 #include "chrome/browser/chromeos/login/user_flow.h"
-#include "chrome/browser/chromeos/login/users/affiliation.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller_delegate.h"
@@ -116,11 +115,6 @@ class ChromeUserManagerImpl
   // UserManagerBase implementation:
   bool AreEphemeralUsersEnabled() const override;
 
-  // ChromeUserManager implementation:
-  void SetUserAffiliation(
-      const std::string& user_email,
-      const AffiliationIDSet& user_affiliation_ids) override;
-
  protected:
   const std::string& GetApplicationLocale() const override;
   PrefService* GetLocalState() const override;

chrome/browser/chromeos/login/users/mock_user_manager.h

@@ -10,7 +10,6 @@
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/login/user_flow.h"
-#include "chrome/browser/chromeos/login/users/affiliation.h"
 #include "chrome/browser/chromeos/login/users/avatar/mock_user_image_manager.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "components/user_manager/user.h"
@@ -96,9 +95,6 @@ class MockUserManager : public ChromeUserManager {
   MOCK_METHOD1(KioskAppLoggedIn, void(const std::string&));
   MOCK_METHOD1(PublicAccountUserLoggedIn, void(user_manager::User*));
   MOCK_METHOD1(SupervisedUserLoggedIn, void(const std::string&));
-  MOCK_METHOD2(SetUserAffiliation,
-               void(const std::string& user_id,
-                    const chromeos::AffiliationIDSet& user_affiliation_ids));
 
   // You can't mock these functions easily because nobody can create
   // User objects but the ChromeUserManager and us.

chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc

@@ -247,7 +247,7 @@ bool BrowserPolicyConnectorChromeOS::IsEnterpriseManaged() {
   return install_attributes_ && install_attributes_->IsEnterpriseDevice();
 }
 
-std::string BrowserPolicyConnectorChromeOS::GetEnterpriseDomain() const {
+std::string BrowserPolicyConnectorChromeOS::GetEnterpriseDomain() {
   return install_attributes_ ? install_attributes_->GetDomain() : std::string();
 }
 
@@ -380,18 +380,4 @@ void BrowserPolicyConnectorChromeOS::RestartDeviceCloudPolicyInitializer() {
   device_cloud_policy_initializer_->Init();
 }
 
-chromeos::AffiliationIDSet
-BrowserPolicyConnectorChromeOS::GetDeviceAffiliationIDs() const {
-  chromeos::AffiliationIDSet affiliation_ids;
-  if (device_cloud_policy_manager_) {
-    const enterprise_management::PolicyData* const policy_data =
-        device_cloud_policy_manager_->device_store()->policy();
-    if (policy_data) {
-      affiliation_ids.insert(policy_data->device_affiliation_ids().begin(),
-                             policy_data->device_affiliation_ids().end());
-    }
-  }
-  return affiliation_ids;
-}
-
 }  // namespace policy

chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h

@@ -5,14 +5,12 @@
 #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"
@@ -65,7 +63,7 @@ class BrowserPolicyConnectorChromeOS
   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();
@@ -146,8 +144,6 @@ class BrowserPolicyConnectorChromeOS
   void OnDeviceCloudPolicyManagerConnected() override;
   void OnDeviceCloudPolicyManagerDisconnected() override;
 
-  chromeos::AffiliationIDSet GetDeviceAffiliationIDs() const;
-
  private:
   // Set the timezone as soon as the policies are available.
   void SetTimezoneIfPolicyAvailable();

chrome/browser/chromeos/policy/enterprise_install_attributes.cc

@@ -324,7 +324,7 @@ void EnterpriseInstallAttributes::OnReadImmutableAttributes(
   callback.Run(LOCK_SUCCESS);
 }
 
-bool EnterpriseInstallAttributes::IsEnterpriseDevice() const {
+bool EnterpriseInstallAttributes::IsEnterpriseDevice() {
   return device_locked_ && !registration_user_.empty();
 }
 
@@ -340,7 +340,7 @@ std::string EnterpriseInstallAttributes::GetRegistrationUser() {
   return registration_user_;
 }
 
-std::string EnterpriseInstallAttributes::GetDomain() const {
+std::string EnterpriseInstallAttributes::GetDomain() {
   if (!IsEnterpriseDevice())
     return std::string();
 

chrome/browser/chromeos/policy/enterprise_install_attributes.h

@@ -75,14 +75,14 @@ class EnterpriseInstallAttributes {
                   const LockResultCallback& callback);
 
   // Checks whether this is an enterprise device.
-  bool IsEnterpriseDevice() const;
+  bool IsEnterpriseDevice();
 
   // Checks whether this is a consumer kiosk enabled device.
   bool IsConsumerKioskDeviceWithAutoLaunch();
 
   // Gets the domain this device belongs to or an empty string if the device is
   // not an enterprise device.
-  std::string GetDomain() const;
+  std::string GetDomain();
 
   // Gets the user that registered the device. Returns an empty string if the
   // device is not an enterprise device.