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

trunk/src/chrome/browser/metrics/metrics_log.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/metrics/metrics_log.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 785 matching lines @@
   device::BluetoothAdapterFactory::GetAdapter(
       base::Bind(&MetricsLog::SetBluetoothAdapter,
                  base::Unretained(this)));
   DCHECK(adapter_.get());
   WriteBluetoothProto(hardware);
   UpdateMultiProfileUserCount();
 #endif
 
   std::string serialied_system_profile;
   std::string base64_system_profile;
-  if (system_profile->SerializeToString(&serialied_system_profile)) {
-    base::Base64Encode(serialied_system_profile, &base64_system_profile);
+  if (system_profile->SerializeToString(&serialied_system_profile) &&
+      base::Base64Encode(serialied_system_profile, &base64_system_profile)) {
     PrefService* local_state = GetPrefService();
     local_state->SetString(prefs::kStabilitySavedSystemProfile,
                            base64_system_profile);
     local_state->SetString(prefs::kStabilitySavedSystemProfileHash,
                            ComputeSHA1(serialied_system_profile));
   }
 }
 
 bool MetricsLog::LoadSavedEnvironmentFromPrefs() {
   PrefService* local_state = GetPrefService();
@@ skipping 177 matching lines @@
 
     // We invalidate the user count if it changed while the log was open.
     if (system_profile->has_multi_profile_user_count() &&
         user_count != system_profile->multi_profile_user_count())
       user_count = 0;
 
     system_profile->set_multi_profile_user_count(user_count);
   }
 }
 #endif