Merge 176800

chrome/browser/chromeos/cros/cert_library.cc

Index: chrome/browser/chromeos/cros/cert_library.cc
===================================================================
--- chrome/browser/chromeos/cros/cert_library.cc	(revision 177312)
+++ chrome/browser/chromeos/cros/cert_library.cc	(working copy)
@@ -197,6 +197,10 @@
   }
 
   virtual std::string EncryptToken(const std::string& token) OVERRIDE {
+    // Don't care about token encryption while debugging.
+    if (!base::chromeos::IsRunningOnChromeOS())
+      return token;
+
     if (!LoadSupplementalUserKey()) {
       LOG(WARNING) << "Supplemental user key is not available for encrypt.";
       return std::string();
@@ -224,6 +228,10 @@
 
   virtual std::string DecryptToken(
       const std::string& encrypted_token_hex) OVERRIDE {
+    // Don't care about token encryption while debugging.
+    if (!base::chromeos::IsRunningOnChromeOS())
+      return encrypted_token_hex;
+
     if (!LoadSupplementalUserKey()) {
       LOG(WARNING) << "Supplemental user key is not available for decrypt.";
       return std::string();