Revert 239759 "The comment in base64.h implies that base::Base64..."

trunk/src/google_apis/gaia/oauth_request_signer.cc

 // Copyright (c) 2012 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 "google_apis/gaia/oauth_request_signer.h"
 
 #include <cctype>
 #include <cstddef>
 #include <cstdlib>
 #include <cstring>
@@ skipping 186 matching lines @@
 
 // Creates the value for the oauth_signature parameter when the
 // oauth_signature_method is HMAC-SHA1.
 bool SignHmacSha1(const std::string& text,
                   const std::string& key,
                   std::string* signature_return) {
   crypto::HMAC hmac(crypto::HMAC::SHA1);
   DCHECK(hmac.DigestLength() == kHmacDigestLength);
   unsigned char digest[kHmacDigestLength];
   bool result = hmac.Init(key) &&
-      hmac.Sign(text, digest, kHmacDigestLength);
-  if (result) {
-    base::Base64Encode(
-        std::string(reinterpret_cast<const char*>(digest), kHmacDigestLength),
-        signature_return);
-  }
+      hmac.Sign(text, digest, kHmacDigestLength) &&
+      base::Base64Encode(std::string(reinterpret_cast<const char*>(digest),
+                                     kHmacDigestLength),
+                         signature_return);
   return result;
 }
 
 // Creates the value for the oauth_signature parameter when the
 // oauth_signature_method is PLAINTEXT.
 //
 // Not yet implemented, and might never be.
 bool SignPlaintext(const std::string& text,
                    const std::string& key,
                    std::string* result) {
@@ skipping 227 matching lines @@
       signed_text +=
           base::StringPrintf(
               "%s=\"%s\"",
               OAuthRequestSigner::Encode(param->first).c_str(),
               OAuthRequestSigner::Encode(param->second).c_str());
     }
     *signed_text_return = signed_text;
   }
   return is_signed;
 }