Mega patch of doom.

chrome/browser/ui/app_list/search/history_data_store.cc

 // Copyright 2013 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/ui/app_list/search/history_data_store.h"
 
 #include "base/callback.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 109 matching lines @@
 }
 
 void HistoryDataStore::Init(base::DictionaryValue* cached_dict) {
   DCHECK(cached_dict);
   cached_dict->SetString(kKeyVersion, kCurrentVersion);
   cached_dict->Set(kKeyAssociations, new base::DictionaryValue);
 }
 
 void HistoryDataStore::Flush(
     const DictionaryDataStore::OnFlushedCallback& on_flushed) {
-  if (data_store_)
+  if (data_store_.get())
     data_store_->Flush(on_flushed);
   else
     on_flushed.Run();
 }
 
 void HistoryDataStore::Load(
     const HistoryDataStore::OnLoadedCallback& on_loaded) {
-  if (data_store_) {
+  if (data_store_.get()) {
     data_store_->Load(base::Bind(&HistoryDataStore::OnDictionaryLoadedCallback,
                                  this,
                                  on_loaded));
   } else {
     OnDictionaryLoadedCallback(
         on_loaded, make_scoped_ptr(cached_dict_->DeepCopy()));
   }
 }
 
 void HistoryDataStore::SetPrimary(const std::string& query,
                                   const std::string& result) {
   base::DictionaryValue* entry_dict = GetEntryDict(query);
   entry_dict->SetWithoutPathExpansion(kKeyPrimary,
                                       new base::StringValue(result));
-  if (data_store_)
+  if (data_store_.get())
     data_store_->ScheduleWrite();
 }
 
 void HistoryDataStore::SetSecondary(
     const std::string& query,
     const HistoryData::SecondaryDeque& results) {
   scoped_ptr<base::ListValue> results_list(new base::ListValue);
   for (size_t i = 0; i< results.size(); ++i)
     results_list->AppendString(results[i]);
 
   base::DictionaryValue* entry_dict = GetEntryDict(query);
   entry_dict->SetWithoutPathExpansion(kKeySecondary, results_list.release());
-  if (data_store_)
+  if (data_store_.get())
     data_store_->ScheduleWrite();
 }
 
 void HistoryDataStore::SetUpdateTime(const std::string& query,
                                      const base::Time& update_time) {
   base::DictionaryValue* entry_dict = GetEntryDict(query);
   entry_dict->SetWithoutPathExpansion(kKeyUpdateTime,
                                       new base::StringValue(base::Int64ToString(
                                           update_time.ToInternalValue())));
-  if (data_store_)
+  if (data_store_.get())
     data_store_->ScheduleWrite();
 }
 
 void HistoryDataStore::Delete(const std::string& query) {
   base::DictionaryValue* assoc_dict = GetAssociationDict();
   assoc_dict->RemoveWithoutPathExpansion(query, NULL);
-  if (data_store_)
+  if (data_store_.get())
     data_store_->ScheduleWrite();
 }
 
 base::DictionaryValue* HistoryDataStore::GetAssociationDict() {
   base::DictionaryValue* cached_dict =
       cached_dict_ ? cached_dict_.get() : data_store_->cached_dict();
   DCHECK(cached_dict);
 
   base::DictionaryValue* assoc_dict = NULL;
   CHECK(cached_dict->GetDictionary(kKeyAssociations, &assoc_dict) &&
@@ skipping 19 matching lines @@
 void HistoryDataStore::OnDictionaryLoadedCallback(
     OnLoadedCallback callback, scoped_ptr<base::DictionaryValue> dict) {
   if (!dict) {
     callback.Run(scoped_ptr<HistoryData::Associations>());
   } else {
     callback.Run(Parse(dict.Pass()).Pass());
   }
 }
 
 }  // namespace app_list