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

trunk/src/sync/protocol/proto_value_conversions.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.
 
 // Keep this file in sync with the .proto files in this directory.
 
 #include "sync/protocol/proto_value_conversions.h"
 
 #include <string>
 
@@ skipping 36 matching lines @@
 // Basic Type -> Value functions.
 
 base::StringValue* MakeInt64Value(int64 x) {
   return new base::StringValue(base::Int64ToString(x));
 }
 
 // TODO(akalin): Perhaps make JSONWriter support BinaryValue and use
 // that instead of a StringValue.
 base::StringValue* MakeBytesValue(const std::string& bytes) {
   std::string bytes_base64;
-  base::Base64Encode(bytes, &bytes_base64);
+  if (!base::Base64Encode(bytes, &bytes_base64)) {
+    NOTREACHED();
+  }
   return new base::StringValue(bytes_base64);
 }
 
 base::StringValue* MakeStringValue(const std::string& str) {
   return new base::StringValue(str);
 }
 
 // T is the enum type.
 template <class T>
 base::StringValue* MakeEnumValue(T t, const char* (*converter_fn)(T)) {
@@ skipping 935 matching lines @@
 #undef SET_BYTES
 #undef SET_INT32
 #undef SET_INT64
 #undef SET_INT64_REP
 #undef SET_STR
 #undef SET_STR_REP
 
 #undef SET_FIELD
 
 }  // namespace syncer