Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(416)

Side by Side Diff: chrome/browser/chromeos/settings/device_settings_cache.cc

Issue 86913002: Make base::Base64Encode() return void (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: One more chromeos-specific fix. Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 5 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 10 matching lines...) Expand all
21 namespace device_settings_cache { 21 namespace device_settings_cache {
22 22
23 void RegisterPrefs(PrefRegistrySimple* registry) { 23 void RegisterPrefs(PrefRegistrySimple* registry) {
24 registry->RegisterStringPref(prefs::kDeviceSettingsCache, "invalid"); 24 registry->RegisterStringPref(prefs::kDeviceSettingsCache, "invalid");
25 } 25 }
26 26
27 bool Store(const em::PolicyData& policy, PrefService* local_state) { 27 bool Store(const em::PolicyData& policy, PrefService* local_state) {
28 if (local_state) { 28 if (local_state) {
29 std::string policy_string = policy.SerializeAsString(); 29 std::string policy_string = policy.SerializeAsString();
30 std::string encoded; 30 std::string encoded;
31 if (!base::Base64Encode(policy_string, &encoded)) { 31 base::Base64Encode(policy_string, &encoded);
32 LOG(ERROR) << "Can't encode policy in base64.";
33 return false;
34 }
35 local_state->SetString(prefs::kDeviceSettingsCache, encoded); 32 local_state->SetString(prefs::kDeviceSettingsCache, encoded);
36 return true; 33 return true;
37 } 34 }
38 return false; 35 return false;
39 } 36 }
40 37
41 bool Retrieve(em::PolicyData *policy, PrefService* local_state) { 38 bool Retrieve(em::PolicyData *policy, PrefService* local_state) {
42 if (local_state) { 39 if (local_state) {
43 std::string encoded = 40 std::string encoded =
44 local_state->GetString(prefs::kDeviceSettingsCache); 41 local_state->GetString(prefs::kDeviceSettingsCache);
45 std::string policy_string; 42 std::string policy_string;
46 if (!base::Base64Decode(encoded, &policy_string)) { 43 if (!base::Base64Decode(encoded, &policy_string)) {
47 // This is normal and happens on first boot. 44 // This is normal and happens on first boot.
48 VLOG(1) << "Can't decode policy from base64."; 45 VLOG(1) << "Can't decode policy from base64.";
49 return false; 46 return false;
50 } 47 }
51 return policy->ParseFromString(policy_string); 48 return policy->ParseFromString(policy_string);
52 } 49 }
53 return false; 50 return false;
54 } 51 }
55 52
56 } // namespace device_settings_cache 53 } // namespace device_settings_cache
57 54
58 } // namespace chromeos 55 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/bookmarks/bookmark_html_writer.cc ('k') | chrome/browser/devtools/adb/android_rsa.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698