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

chrome/browser/signin/easy_unlock_service_signin_chromeos.cc

 // 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.
 
 #include "chrome/browser/signin/easy_unlock_service_signin_chromeos.h"
 
 #include <stdint.h>
 
 #include "base/base64url.h"
 #include "base/bind.h"
@@ skipping 320 matching lines @@
 
 void EasyUnlockServiceSignin::OnFocusedUserChanged(
     const AccountId& account_id) {
   if (account_id_ == account_id)
     return;
 
   // Setting or clearing the account_id may changed |IsAllowed| value, so in
   // these
   // cases update the app state. Otherwise, it's enough to notify the app the
   // user data has been updated.
-  const bool should_update_app_state =
-      account_id_.is_valid() != account_id.is_valid();
+  const bool should_update_app_state = (account_id_ != account_id);
   account_id_ = account_id;
   user_pod_last_focused_timestamp_ = base::TimeTicks::Now();
 
   ResetScreenlockState();
   ShowInitialUserState();
 
   if (should_update_app_state) {
     UpdateAppState();
   } else {
     NotifyUserUpdated();
@@ skipping 15 matching lines @@
   if (!chromeos::LoginState::Get()->IsUserLoggedIn())
     return;
   DisableAppWithoutResettingScreenlockState();
 }
 
 void EasyUnlockServiceSignin::LoadCurrentUserDataIfNeeded() {
   // TODO(xiyuan): Revisit this when adding tests.
   if (!base::SysInfo::IsRunningOnChromeOS())
     return;
 
-  if (account_id_.is_valid() || !service_active_)
+  if (!account_id_.is_valid() || !service_active_)
     return;
 
   const auto it = user_data_.find(account_id_);
   if (it == user_data_.end())
     user_data_.insert(std::make_pair(account_id_, new UserData()));
 
   UserData* data = user_data_[account_id_];
 
   if (data->state != USER_DATA_STATE_INITIAL)
     return;
@@ skipping 71 matching lines @@
                  << "  public key" << device.public_key << "\n"
                  << "  bt_addr:" << remote_device.bluetooth_address
                  << "  type:" << static_cast<int>(remote_device.bluetooth_type);
   }
 
   SetProximityAuthDevices(account_id, remote_devices);
 }
 
 const EasyUnlockServiceSignin::UserData*
     EasyUnlockServiceSignin::FindLoadedDataForCurrentUser() const {
-  if (account_id_.is_valid())
+  if (!account_id_.is_valid())
     return nullptr;
 
   const auto it = user_data_.find(account_id_);
   if (it == user_data_.end())
     return nullptr;
   if (it->second->state != USER_DATA_STATE_LOADED)
     return nullptr;
   return it->second;
 }