Add Statistics for SupervisedUserSettingService during merging and syncing data.

chrome/browser/supervised_user/supervised_user_settings_service.cc

 // Copyright 2014 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/supervised_user/supervised_user_settings_service.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/callback.h"
@@ skipping 197 matching lines @@
   store_->ReportValueChanged(kAtomicSettings,
                              WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   store_->ReportValueChanged(kSplitSettings,
                              WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   InformSubscribers();
 
   // Upload all the queued up items (either with an ADD or an UPDATE action,
   // depending on whether they already exist) and move them to split settings.
   SyncChangeList change_list;
   base::DictionaryValue* queued_items = GetQueuedItems();
+  int num_added = 0;
+  int num_modified = 0;
+  int num_before_association = queued_items->size();

[Bernhard Bauer, 2016/01/05 09:37:30]

This also doesn't seem quite right... This is only the number of items that were
queued for upload (but couldn't be uploaded before, because Sync wasn't ready
yet). The number of items should be the total though, i.e. including all the
atomic and split settings.

[Deepak, 2016/01/05 13:29:19]

I would like to do the changes of this file in separate CL,once the changes of
supervised_user_shared_settings_service.cc goes properly.

[Bernhard Bauer, 2016/01/05 14:10:54]

Acknowledged.

   for (base::DictionaryValue::Iterator it(*queued_items); !it.IsAtEnd();
        it.Advance()) {
     std::string key_suffix = it.key();
     base::DictionaryValue* dict = GetDictionaryAndSplitKey(&key_suffix);
     SyncData data = CreateSyncDataForSetting(it.key(), it.value());
     SyncChange::SyncChangeType change_type =
         dict->HasKey(key_suffix) ? SyncChange::ACTION_UPDATE
                                  : SyncChange::ACTION_ADD;
+    if (change_type == SyncChange::ACTION_ADD)
+      num_added++;
+    else
+      num_modified++;
     change_list.push_back(SyncChange(FROM_HERE, change_type, data));
     dict->SetWithoutPathExpansion(key_suffix, it.value().DeepCopy());
   }
   queued_items->Clear();
 
   SyncMergeResult result(SUPERVISED_USER_SETTINGS);
   // Process all the accumulated changes from the queued items.
   if (change_list.size() > 0) {
     store_->ReportValueChanged(kQueuedItems,
                                WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
     result.set_error(
         sync_processor_->ProcessSyncChanges(FROM_HERE, change_list));
   }
 
-  // TODO(bauerb): Statistics?
+  result.set_num_items_added(num_added);
+  result.set_num_items_modified(num_modified);
+  result.set_num_items_before_association(num_before_association);
+  result.set_num_items_after_association(num_added + num_modified);
   return result;
 }
 
 void SupervisedUserSettingsService::StopSyncing(ModelType type) {
   DCHECK_EQ(syncer::SUPERVISED_USER_SETTINGS, type);
   sync_processor_.reset();
   error_handler_.reset();
 }
 
 SyncDataList SupervisedUserSettingsService::GetAllSyncData(
@@ skipping 159 matching lines @@
   return settings;
 }
 
 void SupervisedUserSettingsService::InformSubscribers() {
   if (!IsReady())
     return;
 
   scoped_ptr<base::DictionaryValue> settings = GetSettings();
   callback_list_.Notify(settings.get());
 }