Revert 239921 "Revert 239759 "The comment in base64.h implies th..."

trunk/src/chrome/browser/internal_auth.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 "chrome/browser/internal_auth.h"
 
 #include <algorithm>
 #include <deque>
 
 #include "base/base64.h"
@@ skipping 148 matching lines @@
   blob += tmp + kItemSeparator + base::Uint64ToString(tick);
 
   std::string hmac;
   unsigned char* hmac_data = reinterpret_cast<unsigned char*>(
       WriteInto(&hmac, kHMACSizeInBytes + 1));
   if (!engine->Sign(blob, hmac_data, kHMACSizeInBytes)) {
     NOTREACHED();
     return;
   }
   std::string hmac_base64;
-  if (!base::Base64Encode(hmac, &hmac_base64)) {
-    NOTREACHED();
-    return;
-  }
+  base::Base64Encode(hmac, &hmac_base64);
   if (hmac_base64.size() != BASE64_PER_RAW(kHMACSizeInBytes)) {
     NOTREACHED();
     return;
   }
   DCHECK(hmac_base64.size() < result.size());
   std::copy(hmac_base64.begin(), hmac_base64.end(), result.begin());
 
   std::string tick_decimal = base::Uint64ToString(tick);
   DCHECK(tick_decimal.size() <= kTickStringLength);
   std::copy(
@@ skipping 285 matching lines @@
     const std::string& domain, const VarValueMap& var_value_map) {
   return g_generation_service.Get().GeneratePassport(domain, var_value_map, 0);
 }
 
 // static
 void InternalAuthGeneration::GenerateNewKey() {
   g_generation_service.Get().GenerateNewKey();
 }
 
 }  // namespace chrome