OAuth2 sign-in flow for ChromeOS

chrome/browser/chromeos/cros/cert_library.cc

Index: chrome/browser/chromeos/cros/cert_library.cc
diff --git a/chrome/browser/chromeos/cros/cert_library.cc b/chrome/browser/chromeos/cros/cert_library.cc
index 8257ad0630942159c1e869b66328f4f741b8e2a5..39ca04a12c623b855c3640e895ac7c3fbdb6e3b3 100644
--- a/chrome/browser/chromeos/cros/cert_library.cc
+++ b/chrome/browser/chromeos/cros/cert_library.cc
@@ -197,6 +197,9 @@ class CertLibraryImpl
   }
 
   virtual std::string EncryptToken(const std::string& token) OVERRIDE {
+#ifndef NDEBUG

[Joao da Silva, 2013/01/11 16:45:07]

Is this meant to stay in?

[zel, 2013/01/11 19:51:16]

Yes it is going to stay in. While we develop on Linux workstations, we don't
really care about encryption but without this function working properly we can't
test use cases when users are already signed in. Once we fully move to OAuth2,
this function is going away.

[Joao da Silva, 2013/01/11 20:13:15]

Ah, I see now. IsRunningOnChromeOS() may be a more reliable signal in that case,
and works for Release builds on linux.

[zel, 2013/01/11 20:54:20]

Done.

+    return token;
+#else
     if (!LoadSupplementalUserKey()) {
       LOG(WARNING) << "Supplemental user key is not available for encrypt.";
       return std::string();
@@ -220,10 +223,14 @@ class CertLibraryImpl
     return StringToLowerASCII(base::HexEncode(
         reinterpret_cast<const void*>(encoded_token.data()),
         encoded_token.size()));
+#endif
   }
 
   virtual std::string DecryptToken(
       const std::string& encrypted_token_hex) OVERRIDE {
+#ifndef NDEBUG
+    return encrypted_token_hex;
+#else
     if (!LoadSupplementalUserKey()) {
       LOG(WARNING) << "Supplemental user key is not available for decrypt.";
       return std::string();
@@ -231,6 +238,7 @@ class CertLibraryImpl
     return DecryptTokenWithKey(supplemental_user_key_.get(),
         CrosLibrary::Get()->GetCryptohomeLibrary()->GetSystemSalt(),
         encrypted_token_hex);
+#endif
   }
 
   // net::CertDatabase::Observer implementation. Observer added on UI thread.