Small logic change to StateStore::Transaction::ClearAll

chrome/browser/safe_browsing/incident_reporting/state_store.cc

 // Copyright 2015 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/safe_browsing/incident_reporting/state_store.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
@@ skipping 45 matching lines @@
   // will result in a full serialize-and-write operation on the preferences
   // store.
   std::string type_string(base::IntToString(static_cast<int32_t>(type)));
   const base::DictionaryValue* type_dict = nullptr;
   if (store_->incidents_sent_->GetDictionaryWithoutPathExpansion(type_string,
                                                                  &type_dict)) {
     GetPrefDict()->RemoveWithoutPathExpansion(type_string, nullptr);
   }
 }
 
 void StateStore::Transaction::ClearAll() {

[grt (UTC plus 2), 2015/09/14 18:42:39]

looks like there's no unittest for this. could you add one?

[proberge, 2015/09/14 19:59:52]

Done.

-  if (pref_update_)
-    pref_update_.reset();
-  if (store_->incidents_sent_) {
-    store_->incidents_sent_ = nullptr;
-    store_->profile_->GetPrefs()->ClearPref(prefs::kSafeBrowsingIncidentsSent);
-  }
+  // Clear the preference if it exists and contains any values.
+  if (store_->incidents_sent_ && !store_->incidents_sent_->empty())
+    GetPrefDict()->Clear();
 }
 
 base::DictionaryValue* StateStore::Transaction::GetPrefDict() {
   if (!pref_update_) {
     pref_update_.reset(new DictionaryPrefUpdate(
         store_->profile_->GetPrefs(), prefs::kSafeBrowsingIncidentsSent));
     // Getting the dict will cause it to be created if it doesn't exist.
     // Unconditionally refresh the store's read-only view on the preference so
     // that it will always be correct.
     store_->incidents_sent_ = pref_update_->Get();
@@ skipping 67 matching lines @@
   static const IncidentType kLegacyTypes[] = {
       // TODO(grt): remove in M44 (crbug.com/451173).
       IncidentType::OMNIBOX_INTERACTION,
   };
 
   for (IncidentType type : kLegacyTypes)
     transaction->ClearForType(type);
 }
 
 }  // namespace safe_browsing