Cleanup nits in ImportantFileWriter and JsonPrefStore.

base/prefs/json_pref_store.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 "base/prefs/json_pref_store.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 65 matching lines @@
         base::FilePath bad = path.ReplaceExtension(kBadExtension);
 
         // If they've ever had a parse error before, put them in another bucket.
         // TODO(erikkay) if we keep this error checking for very long, we may
         // want to differentiate between recent and long ago errors.
         bool bad_existed = base::PathExists(bad);
         base::Move(path, bad);
         return bad_existed ? PersistentPrefStore::PREF_READ_ERROR_JSON_REPEAT
                            : PersistentPrefStore::PREF_READ_ERROR_JSON_PARSE;
     }
-  } else if (!value->IsType(base::Value::TYPE_DICTIONARY)) {
+  }
+  if (!value->IsType(base::Value::TYPE_DICTIONARY))
     return PersistentPrefStore::PREF_READ_ERROR_JSON_TYPE;
-  }
   return PersistentPrefStore::PREF_READ_ERROR_NONE;
 }
 
 // Records a sample for |size| in the Settings.JsonDataReadSizeKilobytes
 // histogram suffixed with the base name of the JSON file under |path|.
 void RecordJsonDataSizeHistogram(const base::FilePath& path, size_t size) {
   std::string spaceless_basename;
   base::ReplaceChars(path.BaseName().MaybeAsASCII(), " ", "_",
                      &spaceless_basename);
 
@@ skipping 37 matching lines @@
     const base::FilePath& filename,
     base::SequencedWorkerPool* worker_pool) {
   std::string token("json_pref_store-");
   token.append(filename.AsUTF8Unsafe());
   return worker_pool->GetSequencedTaskRunnerWithShutdownBehavior(
       worker_pool->GetNamedSequenceToken(token),
       base::SequencedWorkerPool::BLOCK_SHUTDOWN);
 }
 
 JsonPrefStore::JsonPrefStore(
-    const base::FilePath& filename,
+    const base::FilePath& pref_filename,
     const scoped_refptr<base::SequencedTaskRunner>& sequenced_task_runner,
     scoped_ptr<PrefFilter> pref_filter)
-    : JsonPrefStore(filename,
+    : JsonPrefStore(pref_filename,
                     base::FilePath(),
                     sequenced_task_runner,
                     pref_filter.Pass()) {
 }
 
 JsonPrefStore::JsonPrefStore(
-    const base::FilePath& filename,
-    const base::FilePath& alternate_filename,
+    const base::FilePath& pref_filename,
+    const base::FilePath& pref_alternate_filename,
     const scoped_refptr<base::SequencedTaskRunner>& sequenced_task_runner,
     scoped_ptr<PrefFilter> pref_filter)
-    : path_(filename),
-      alternate_path_(alternate_filename),
+    : path_(pref_filename),
+      alternate_path_(pref_alternate_filename),
       sequenced_task_runner_(sequenced_task_runner),
       prefs_(new base::DictionaryValue()),
       read_only_(false),
-      writer_(filename, sequenced_task_runner),
+      writer_(pref_filename, sequenced_task_runner),
       pref_filter_(pref_filter.Pass()),
       initialized_(false),
       filtering_in_progress_(false),
       pending_lossy_write_(false),
       read_error_(PREF_READ_ERROR_NONE),
       write_count_histogram_(writer_.commit_interval(), path_) {
   DCHECK(!path_.empty());
 }
 
 bool JsonPrefStore::GetValue(const std::string& key,
                              const base::Value** result) const {
   DCHECK(CalledOnValidThread());
 
-  base::Value* tmp = NULL;
+  base::Value* tmp = nullptr;
   if (!prefs_->Get(key, &tmp))
     return false;
 
   if (result)
     *result = tmp;
   return true;
 }
 
 void JsonPrefStore::AddObserver(PrefStore::Observer* observer) {
   DCHECK(CalledOnValidThread());
@@ skipping 25 matching lines @@
 
   return prefs_->Get(key, result);
 }
 
 void JsonPrefStore::SetValue(const std::string& key,
                              scoped_ptr<base::Value> value,
                              uint32 flags) {
   DCHECK(CalledOnValidThread());
 
   DCHECK(value);
-  base::Value* old_value = NULL;
+  base::Value* old_value = nullptr;
   prefs_->Get(key, &old_value);
   if (!old_value || !value->Equals(old_value)) {
     prefs_->Set(key, value.Pass());
     ReportValueChanged(key, flags);
   }
 }
 
 void JsonPrefStore::SetValueSilently(const std::string& key,
                                      scoped_ptr<base::Value> value,
                                      uint32 flags) {
   DCHECK(CalledOnValidThread());
 
   DCHECK(value);
-  base::Value* old_value = NULL;
+  base::Value* old_value = nullptr;
   prefs_->Get(key, &old_value);
   if (!old_value || !value->Equals(old_value)) {
     prefs_->Set(key, value.Pass());
     ScheduleWrite(flags);
   }
 }
 
 void JsonPrefStore::RemoveValue(const std::string& key, uint32 flags) {
   DCHECK(CalledOnValidThread());
 
-  if (prefs_->RemovePath(key, NULL))
+  if (prefs_->RemovePath(key, nullptr))
     ReportValueChanged(key, flags);
 }
 
 void JsonPrefStore::RemoveValueSilently(const std::string& key, uint32 flags) {
   DCHECK(CalledOnValidThread());
 
-  prefs_->RemovePath(key, NULL);
+  prefs_->RemovePath(key, nullptr);
   ScheduleWrite(flags);
 }
 
 bool JsonPrefStore::ReadOnly() const {
   DCHECK(CalledOnValidThread());
 
   return read_only_;
 }
 
 PersistentPrefStore::PrefReadError JsonPrefStore::GetReadError() const {
@@ skipping 258 matching lines @@
   DCHECK_EQ(31, num_buckets);
 
   // The histogram below is an expansion of the UMA_HISTOGRAM_CUSTOM_COUNTS
   // macro adapted to allow for a dynamically suffixed histogram name.
   // Note: The factory creates and owns the histogram.
   base::HistogramBase* histogram = base::Histogram::FactoryGet(
       histogram_name, min_value, max_value, num_buckets,
       base::HistogramBase::kUmaTargetedHistogramFlag);
   return histogram;
 }