Remove hacks added to workaround a system salt issue for M31

chrome/browser/chromeos/settings/device_oauth2_token_service.cc

Index: chrome/browser/chromeos/settings/device_oauth2_token_service.cc
diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service.cc b/chrome/browser/chromeos/settings/device_oauth2_token_service.cc
index 64f2c8400094cf9a6557bd22c43cfd9304dbd382..c0412beabae76abaa249e02b0ee5438d580f183d 100644
--- a/chrome/browser/chromeos/settings/device_oauth2_token_service.cc
+++ b/chrome/browser/chromeos/settings/device_oauth2_token_service.cc
@@ -237,20 +237,6 @@ void DeviceOAuth2TokenService::SetAndSaveRefreshToken(
     const std::string& refresh_token) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
-  // TODO(xiyuan): Use async GetSystemSalt after merging to M31.
-  const std::string system_salt = SystemSaltGetter::Get()->GetSystemSaltSync();
-  if (system_salt.empty()) {
-    const int64 kRequestSystemSaltDelayMs = 500;
-    content::BrowserThread::PostDelayedTask(
-        content::BrowserThread::UI,
-        FROM_HERE,
-        base::Bind(&DeviceOAuth2TokenService::SetAndSaveRefreshToken,
-                   weak_ptr_factory_.GetWeakPtr(),
-                   refresh_token),
-        base::TimeDelta::FromMilliseconds(kRequestSystemSaltDelayMs));
-    return;
-  }
-
   std::string encrypted_refresh_token =
       token_encryptor_->EncryptWithSystemSalt(refresh_token);
 
@@ -265,10 +251,6 @@ std::string DeviceOAuth2TokenService::GetRefreshToken(
     std::string encrypted_refresh_token =
         local_state_->GetString(prefs::kDeviceRobotAnyApiRefreshToken);
 
-    // TODO(xiyuan): This needs a proper fix after M31.
-    LOG_IF(ERROR, SystemSaltGetter::Get()->GetSystemSaltSync().empty())
-        << "System salt is not available for decryption";
-
     refresh_token_ = token_encryptor_->DecryptWithSystemSalt(
         encrypted_refresh_token);
   }