Remove hacks added to workaround a system salt issue for M31

chrome/browser/chromeos/settings/device_oauth2_token_service.cc

 // Copyright 2013 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/chromeos/settings/device_oauth2_token_service.h"
 
 #include <string>
 #include <vector>
 
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/settings/token_encryptor.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/cryptohome/system_salt_getter.h"

[hashimoto, 2013/10/25 05:17:03]

nit: No need to include this?

[satorux1, 2013/10/25 05:23:57]

Done.

[hashimoto, 2013/10/25 05:25:39]

I see no changes here.
Is this include needed in this file?

[satorux1, 2013/10/25 05:30:37]

oops. I forgot about this one. removed.

[hashimoto, 2013/10/25 05:31:56]

Ah, you removed the one in startup_app_launcher.cc.
It's a good catch indeed.

 #include "content/public/browser/browser_thread.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 
 namespace {
 const char kServiceScopeGetUserInfo[] =
     "https://www.googleapis.com/auth/userinfo.email";
 }
 
 namespace chromeos {
@@ skipping 200 matching lines @@
 // static
 void DeviceOAuth2TokenService::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterStringPref(prefs::kDeviceRobotAnyApiRefreshToken,
                                std::string());
 }
 
 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);
 
   local_state_->SetString(prefs::kDeviceRobotAnyApiRefreshToken,
                           encrypted_refresh_token);
 }
 
 std::string DeviceOAuth2TokenService::GetRefreshToken(
     const std::string& account_id) {
   DCHECK_EQ(account_id, GetRobotAccountId());
   if (refresh_token_.empty()) {
     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);
   }
   return refresh_token_;
 }
 
 std::string DeviceOAuth2TokenService::GetRobotAccountId() {
   policy::BrowserPolicyConnector* connector =
       g_browser_process->browser_policy_connector();
   if (connector)
@@ skipping 12 matching lines @@
     return OAuth2TokenService::CreateRequest(consumer);
 
   // Substitute our own consumer to wait for refresh token validation.
   scoped_ptr<ValidatingConsumer> validating_consumer(
       new ValidatingConsumer(this, consumer));
   validating_consumer->StartValidation();
   return validating_consumer.PassAs<RequestImpl>();
 }
 
 }  // namespace chromeos