[Part-2]Add Statistics for SupervisedUserSettingService during merging and syncing data.

chrome/browser/supervised_user/supervised_user_settings_service.cc

Index: chrome/browser/supervised_user/supervised_user_settings_service.cc
diff --git a/chrome/browser/supervised_user/supervised_user_settings_service.cc b/chrome/browser/supervised_user/supervised_user_settings_service.cc
index db09106b4e5df4dd6792f75746f69d280395fa07..6a1686e085e2f6cf8a7e1c653304f2f4d5431693 100644
--- a/chrome/browser/supervised_user/supervised_user_settings_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_settings_service.cc
@@ -78,7 +78,7 @@ void SupervisedUserSettingsService::Init(
     // is fixed.
     CHECK(store_->IsInitializationComplete());
   } else {
-    store_->ReadPrefsAsync(NULL);
+    store_->ReadPrefsAsync(nullptr);
   }
 }
 
@@ -134,7 +134,7 @@ void SupervisedUserSettingsService::UploadItem(const std::string& key,
   DCHECK(!SettingShouldApplyToPrefs(key));
 
   std::string key_suffix = key;
-  base::DictionaryValue* dict = NULL;
+  base::DictionaryValue* dict = nullptr;
   if (sync_processor_) {
     content::RecordAction(UserMetricsAction("ManagedUsers_UploadItem_Syncing"));
     dict = GetDictionaryAndSplitKey(&key_suffix);
@@ -163,7 +163,7 @@ void SupervisedUserSettingsService::SetLocalSetting(
   if (value)
     local_settings_->SetWithoutPathExpansion(key, value.release());
   else
-    local_settings_->RemoveWithoutPathExpansion(key, NULL);
+    local_settings_->RemoveWithoutPathExpansion(key, nullptr);
 
   InformSubscribers();
 }
@@ -193,8 +193,28 @@ SyncMergeResult SupervisedUserSettingsService::MergeDataAndStartSyncing(
   sync_processor_ = std::move(sync_processor);
   error_handler_ = std::move(error_handler);
 
+  std::map<std::string, const base::Value*> seen_keys;
+  int num_before_association = GetAtomicSettings()->size();
+  for (base::DictionaryValue::Iterator it(*GetAtomicSettings()); !it.IsAtEnd();
+       it.Advance()) {
+    seen_keys[it.key()] = &it.value();
+  }
+  for (base::DictionaryValue::Iterator it(*GetSplitSettings()); !it.IsAtEnd();
+       it.Advance()) {
+    const base::DictionaryValue* dict = nullptr;
+    it.value().GetAsDictionary(&dict);
+    num_before_association += dict->size();
+    for (base::DictionaryValue::Iterator jt(*dict); !jt.IsAtEnd();
+         jt.Advance()) {
+      seen_keys[MakeSplitSettingKey(it.key(), jt.key())] = &jt.value();
+    }
+  }
+
   // Clear all atomic and split settings, then recreate them from Sync data.
   Clear();
+  int num_added = 0;
+  int num_modified = 0;
+  std::map<std::string, const base::Value*> added_sync_keys;
   for (const SyncData& sync_data : initial_sync_data) {
     DCHECK_EQ(SUPERVISED_USER_SETTINGS, sync_data.GetDataType());
     const ::sync_pb::ManagedUserSettingSpecifics& supervised_user_setting =
@@ -202,9 +222,18 @@ SyncMergeResult SupervisedUserSettingsService::MergeDataAndStartSyncing(
     scoped_ptr<base::Value> value =
         JSONReader::Read(supervised_user_setting.value());
     std::string name_suffix = supervised_user_setting.name();
+    std::string name_key = name_suffix;
     base::DictionaryValue* dict = GetDictionaryAndSplitKey(&name_suffix);
     dict->SetWithoutPathExpansion(name_suffix, value.release());
+    const auto& it = seen_keys.find(name_key);

[Bernhard Bauer, 2016/01/20 17:03:04]

Just auto (the return value of find is an iterator, not a reference to it or to
an element).

[Deepak, 2016/01/21 06:15:59]

Done.

+    if (it == seen_keys.end()) {
+      added_sync_keys[name_key] = value.get();
+      num_added++;
+    } else if (!Value::Equals(it->second, value.get())) {

[Bernhard Bauer, 2016/01/20 17:03:04]

You can call the .Equals() method on either of these; they shouldn't be null.

[Deepak, 2016/01/21 06:15:59]

After thinking a little more, I feel no need to check the value info, as when
key is present in the map that means it is for the modification only, so
removing this unnecessary check.

+      num_modified++;
+    }
   }
+
   store_->ReportValueChanged(kAtomicSettings,
                              WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   store_->ReportValueChanged(kSplitSettings,
@@ -218,6 +247,7 @@ SyncMergeResult SupervisedUserSettingsService::MergeDataAndStartSyncing(
   for (base::DictionaryValue::Iterator it(*queued_items); !it.IsAtEnd();
        it.Advance()) {
     std::string key_suffix = it.key();
+    std::string name_key = key_suffix;
     base::DictionaryValue* dict = GetDictionaryAndSplitKey(&key_suffix);
     SyncData data = CreateSyncDataForSetting(it.key(), it.value());
     SyncChange::SyncChangeType change_type =
@@ -225,6 +255,10 @@ SyncMergeResult SupervisedUserSettingsService::MergeDataAndStartSyncing(
                                  : SyncChange::ACTION_ADD;
     change_list.push_back(SyncChange(FROM_HERE, change_type, data));
     dict->SetWithoutPathExpansion(key_suffix, it.value().DeepCopy());
+    if (added_sync_keys.find(name_key) != added_sync_keys.end()) {
+      num_added--;
+      num_modified++;

[Bernhard Bauer, 2016/01/20 17:03:04]

I don't even think this one is modified locally, because for uploaded items the
local version wins.

[Deepak, 2016/01/21 06:15:59]

Is this means we should consider only addition and modification of the items by
the local version/initial_sync_data only and should not consider the items added
or modified by the queued items(That are added by the local/initial_sync_data),
and queues items will be just uploaded and will not be considered in the
statistic calculations.

So the values in our test case should be:
  EXPECT_EQ(1, result.num_items_added());
  EXPECT_EQ(2, result.num_items_deleted());
  EXPECT_EQ(1, result.num_items_modified());
  EXPECT_EQ(3, result.num_items_before_association());
  EXPECT_EQ(4, result.num_items_after_association());

+    }
   }
   queued_items->Clear();
 
@@ -237,7 +271,21 @@ SyncMergeResult SupervisedUserSettingsService::MergeDataAndStartSyncing(
         sync_processor_->ProcessSyncChanges(FROM_HERE, change_list));
   }
 
-  // TODO(bauerb): Statistics?
+  // Calculating number of items after association.
+  int num_after_association = GetAtomicSettings()->size();
+  for (base::DictionaryValue::Iterator it(*GetSplitSettings()); !it.IsAtEnd();
+       it.Advance()) {
+    const base::DictionaryValue* dict = nullptr;
+    it.value().GetAsDictionary(&dict);
+    num_after_association += dict->size();
+  }
+
+  result.set_num_items_added(num_added);
+  result.set_num_items_modified(num_modified);
+  result.set_num_items_deleted(num_after_association -
+                               (num_added + num_modified));
+  result.set_num_items_before_association(num_before_association);
+  result.set_num_items_after_association(num_after_association);
   return result;
 }
 
@@ -257,7 +305,7 @@ SyncDataList SupervisedUserSettingsService::GetAllSyncData(
   }
   for (base::DictionaryValue::Iterator it(*GetSplitSettings()); !it.IsAtEnd();
        it.Advance()) {
-    const base::DictionaryValue* dict = NULL;
+    const base::DictionaryValue* dict = nullptr;
     it.value().GetAsDictionary(&dict);
     for (base::DictionaryValue::Iterator jt(*dict);
          !jt.IsAtEnd(); jt.Advance()) {
@@ -298,7 +346,7 @@ SyncError SupervisedUserSettingsService::ProcessSyncChanges(
       case SyncChange::ACTION_DELETE: {
         DLOG_IF(WARNING, !dict->HasKey(key)) << "Trying to delete nonexistent "
                                              << "key " << key;
-        dict->RemoveWithoutPathExpansion(key, NULL);
+        dict->RemoveWithoutPathExpansion(key, nullptr);
         break;
       }
       case SyncChange::ACTION_INVALID: {
@@ -337,8 +385,8 @@ void SupervisedUserSettingsService::OnInitializationCompleted(bool success) {
 
 base::DictionaryValue* SupervisedUserSettingsService::GetOrCreateDictionary(
     const std::string& key) const {
-  base::Value* value = NULL;
-  base::DictionaryValue* dict = NULL;
+  base::Value* value = nullptr;
+  base::DictionaryValue* dict = nullptr;
   if (store_->GetMutableValue(key, &value)) {
     bool success = value->GetAsDictionary(&dict);
     DCHECK(success);
@@ -372,7 +420,7 @@ base::DictionaryValue* SupervisedUserSettingsService::GetDictionaryAndSplitKey(
 
   base::DictionaryValue* split_settings = GetSplitSettings();
   std::string prefix = key->substr(0, pos);
-  base::DictionaryValue* dict = NULL;
+  base::DictionaryValue* dict = nullptr;
   if (!split_settings->GetDictionary(prefix, &dict)) {
     dict = new base::DictionaryValue;
     DCHECK(!split_settings->HasKey(prefix));