Fix Smart Lock bugs introduced by change from raw email to AccountId.

chrome/browser/signin/easy_unlock_service_unittest_chromeos.cc

 // Copyright 2015 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.
 
 #include "chrome/browser/signin/easy_unlock_service.h"
 
 #include <stddef.h>
 #include <map>
 #include <string>
 #include <utility>
@@ skipping 27 matching lines @@
 using chromeos::ProfileHelper;
 using device::MockBluetoothAdapter;
 using testing::_;
 using testing::AnyNumber;
 using testing::Return;
 
 namespace {
 
 // IDs for fake users used in tests.
 const char kTestUserPrimary[] = "primary_user@nowhere.com";
+const char kPrimaryGaiaId[] = "1111111111";
 const char kTestUserSecondary[] = "secondary_user@nowhere.com";
+const char kSecondaryGaiaId[] = "2222222222";
 
 // App manager to be used in EasyUnlockService tests.
 // This effectivelly abstracts the extension system from the tests.
 class TestAppManager : public EasyUnlockAppManager {
  public:
   TestAppManager()
       : state_(STATE_NOT_LOADED),
         app_launch_count_(0u),
         reload_count_(0u),
         ready_(false) {}
@@ skipping 156 matching lines @@
     power_manager_client_ = new FakePowerManagerClient;
     dbus_setter->SetPowerManagerClient(
         scoped_ptr<PowerManagerClient>(power_manager_client_));
 
     ON_CALL(*mock_user_manager_, Shutdown()).WillByDefault(Return());
     ON_CALL(*mock_user_manager_, IsLoggedInAsUserWithGaiaAccount())
         .WillByDefault(Return(true));
     ON_CALL(*mock_user_manager_, IsCurrentUserNonCryptohomeDataEphemeral())
         .WillByDefault(Return(false));
 
-    SetUpProfile(&profile_, AccountId::FromUserEmail(kTestUserPrimary));
+    SetUpProfile(&profile_, AccountId::FromUserEmailGaiaId(
+        kTestUserPrimary, kPrimaryGaiaId));
   }
 
   void TearDown() override {
     delete app_manager_factory;
     app_manager_factory = NULL;
   }
 
   void SetEasyUnlockAllowedPolicy(bool allowed) {
     profile_->GetTestingPrefService()->SetManagedPref(
         prefs::kEasyUnlockAllowed, new base::FundamentalValue(allowed));
@@ skipping 24 matching lines @@
 
   void SetAppManagerReady(content::BrowserContext* context) {
     ASSERT_TRUE(app_manager_factory);
     TestAppManager* app_manager = app_manager_factory->Find(context);
     ASSERT_TRUE(app_manager);
     app_manager->SetReady();
   }
 
   void SetUpSecondaryProfile() {
     SetUpProfile(&secondary_profile_,
-                 AccountId::FromUserEmail(kTestUserSecondary));
+                 AccountId::FromUserEmailGaiaId(kTestUserSecondary,
+                 kSecondaryGaiaId));
   }
 
  private:
   // Sets up a test profile with a user id.
   void SetUpProfile(scoped_ptr<TestingProfile>* profile,
                     const AccountId& account_id) {
     ASSERT_TRUE(profile);
     ASSERT_FALSE(profile->get());
 
     TestingProfile::Builder builder;
     builder.AddTestingFactory(EasyUnlockServiceFactory::GetInstance(),
                               &CreateEasyUnlockServiceForTest);
     *profile = builder.Build();
 
     mock_user_manager_->AddUser(account_id);
     profile->get()->set_profile_name(account_id.GetUserEmail());
 
     SigninManagerBase* signin_manager =
         SigninManagerFactory::GetForProfile(profile->get());
-    signin_manager->SetAuthenticatedAccountInfo(account_id.GetUserEmail(),
+    signin_manager->SetAuthenticatedAccountInfo(account_id.GetGaiaId(),
                                                 account_id.GetUserEmail());
   }
 
  protected:
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<TestingProfile> secondary_profile_;
   chromeos::MockUserManager* mock_user_manager_;
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;
@@ skipping 67 matching lines @@
 TEST_F(EasyUnlockServiceTest, NotAllowedForEphemeralAccounts) {
   ON_CALL(*mock_user_manager_, IsCurrentUserNonCryptohomeDataEphemeral())
       .WillByDefault(Return(true));
 
   SetAppManagerReady(profile_.get());
   EXPECT_FALSE(EasyUnlockService::Get(profile_.get())->IsAllowed());
   EXPECT_TRUE(
       EasyUnlockAppInState(profile_.get(), TestAppManager::STATE_NOT_LOADED));
 }
 
+TEST_F(EasyUnlockServiceTest, GetAccountId) {
+  EXPECT_EQ(AccountId::FromUserEmailGaiaId(kTestUserPrimary, kPrimaryGaiaId),
+            EasyUnlockService::Get(profile_.get())->GetAccountId());
+
+  SetUpSecondaryProfile();
+  EXPECT_EQ(AccountId::FromUserEmailGaiaId(kTestUserSecondary,
+                                           kSecondaryGaiaId),
+            EasyUnlockService::Get(secondary_profile_.get())->GetAccountId());
+}
+
 }  // namespace