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

Side by Side Diff: base/json/json_file_value_serializer.cc

Issue 891663003: Log pref file size histogram on read rather than on write. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits / format / only log on successful read Created 5 years, 10 months 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
« no previous file with comments | « base/json/json_file_value_serializer.h ('k') | base/prefs/json_pref_store.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/json/json_file_value_serializer.h" 5 #include "base/json/json_file_value_serializer.h"
6 6
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/json/json_string_value_serializer.h" 8 #include "base/json/json_string_value_serializer.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 10
11 using base::FilePath; 11 using base::FilePath;
12 12
13 const char JSONFileValueSerializer::kAccessDenied[] = "Access denied."; 13 const char JSONFileValueSerializer::kAccessDenied[] = "Access denied.";
14 const char JSONFileValueSerializer::kCannotReadFile[] = "Can't read file."; 14 const char JSONFileValueSerializer::kCannotReadFile[] = "Can't read file.";
15 const char JSONFileValueSerializer::kFileLocked[] = "File locked."; 15 const char JSONFileValueSerializer::kFileLocked[] = "File locked.";
16 const char JSONFileValueSerializer::kNoSuchFile[] = "File doesn't exist."; 16 const char JSONFileValueSerializer::kNoSuchFile[] = "File doesn't exist.";
17 17
18 JSONFileValueSerializer::JSONFileValueSerializer(
19 const base::FilePath& json_file_path)
20 : json_file_path_(json_file_path),
21 allow_trailing_comma_(false),
22 last_read_size_(0U) {
23 }
24
25 JSONFileValueSerializer::~JSONFileValueSerializer() {
26 }
27
18 bool JSONFileValueSerializer::Serialize(const base::Value& root) { 28 bool JSONFileValueSerializer::Serialize(const base::Value& root) {
19 return SerializeInternal(root, false); 29 return SerializeInternal(root, false);
20 } 30 }
21 31
22 bool JSONFileValueSerializer::SerializeAndOmitBinaryValues( 32 bool JSONFileValueSerializer::SerializeAndOmitBinaryValues(
23 const base::Value& root) { 33 const base::Value& root) {
24 return SerializeInternal(root, true); 34 return SerializeInternal(root, true);
25 } 35 }
26 36
27 bool JSONFileValueSerializer::SerializeInternal(const base::Value& root, 37 bool JSONFileValueSerializer::SerializeInternal(const base::Value& root,
(...skipping 24 matching lines...) Expand all
52 return JSON_FILE_LOCKED; 62 return JSON_FILE_LOCKED;
53 } else if (error == ERROR_ACCESS_DENIED) { 63 } else if (error == ERROR_ACCESS_DENIED) {
54 return JSON_ACCESS_DENIED; 64 return JSON_ACCESS_DENIED;
55 } 65 }
56 #endif 66 #endif
57 if (!base::PathExists(json_file_path_)) 67 if (!base::PathExists(json_file_path_))
58 return JSON_NO_SUCH_FILE; 68 return JSON_NO_SUCH_FILE;
59 else 69 else
60 return JSON_CANNOT_READ_FILE; 70 return JSON_CANNOT_READ_FILE;
61 } 71 }
72
73 last_read_size_ = json_string->size();
62 return JSON_NO_ERROR; 74 return JSON_NO_ERROR;
63 } 75 }
64 76
65 const char* JSONFileValueSerializer::GetErrorMessageForCode(int error_code) { 77 const char* JSONFileValueSerializer::GetErrorMessageForCode(int error_code) {
66 switch (error_code) { 78 switch (error_code) {
67 case JSON_NO_ERROR: 79 case JSON_NO_ERROR:
68 return ""; 80 return "";
69 case JSON_ACCESS_DENIED: 81 case JSON_ACCESS_DENIED:
70 return kAccessDenied; 82 return kAccessDenied;
71 case JSON_CANNOT_READ_FILE: 83 case JSON_CANNOT_READ_FILE:
(...skipping 17 matching lines...) Expand all
89 *error_code = error; 101 *error_code = error;
90 if (error_str) 102 if (error_str)
91 *error_str = GetErrorMessageForCode(error); 103 *error_str = GetErrorMessageForCode(error);
92 return NULL; 104 return NULL;
93 } 105 }
94 106
95 JSONStringValueSerializer serializer(json_string); 107 JSONStringValueSerializer serializer(json_string);
96 serializer.set_allow_trailing_comma(allow_trailing_comma_); 108 serializer.set_allow_trailing_comma(allow_trailing_comma_);
97 return serializer.Deserialize(error_code, error_str); 109 return serializer.Deserialize(error_code, error_str);
98 } 110 }
OLDNEW
« no previous file with comments | « base/json/json_file_value_serializer.h ('k') | base/prefs/json_pref_store.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698