Changed OAuth token+secret encryption to use supplemental user key.

chrome/browser/chromeos/login/authenticator.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_AUTHENTICATOR_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_AUTHENTICATOR_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
@@ skipping 82 matching lines @@
                          const std::string& login_token,
                          const std::string& login_captcha) = 0;
 
   // Kicks of verification of OAuth1 access token.
   virtual void VerifyOAuth1AccessToken(const std::string& oauth1_access_token,
                                        const std::string& oauth1_secret) = 0;
 
   // OAuth token encryption helpers.
   virtual std::string EncryptToken(const std::string& token) = 0;
   virtual std::string DecryptToken(const std::string& encrypted_token) = 0;
+  // TODO(zelidrag): Remove legacy encryption support in R16.
+  virtual std::string DecryptLegacyToken(
+      const std::string& encrypted_token) = 0;
 
   // Profile (usually off the record ) that was used to perform the last
   // authentication process.
   Profile* authentication_profile() { return authentication_profile_; }
 
   // Perform basic canonicalization of |email_address|, taking into account
   // that gmail does not consider '.' or caps inside a username to matter.
   // It also ignores everything after a '+'.
   // For example, c.masone+abc@gmail.com == cMaSone@gmail.com, per
   // http://mail.google.com/support/bin/answer.py?hl=en&ctx=mail&answer=10313#
   static std::string Canonicalize(const std::string& email_address);
 
  protected:
   LoginStatusConsumer* consumer_;
   Profile* authentication_profile_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Authenticator);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_AUTHENTICATOR_H_