[Sync] UMA: log only datatypes explicitly listed on the sync prefs page

chrome/browser/ui/webui/sync_setup_handler.cc

 // Copyright (c) 2011 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/webui/sync_setup_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 156 matching lines @@
       config->secondary_passphrase = passphrase;
     }
   }
   return true;
 }
 
 bool HasConfigurationChanged(const SyncConfiguration& config,
                              Profile* profile) {
   CHECK(profile);
 
+  // This function must be updated every time a new sync datatype is added to
+  // the sync preferences page.
+  COMPILE_ASSERT(17 == syncable::MODEL_TYPE_COUNT,
+                 UpdateCustomConfigHistogram);
+
   // If service is null or if this is a first time configuration, return true.
   ProfileSyncService* service = profile->GetProfileSyncService();
   if (!service || !service->HasSyncSetupCompleted())
     return true;
 
   if ((config.set_secondary_passphrase || config.set_gaia_passphrase) &&
       !service->IsUsingSecondaryPassphrase())
     return true;
 
   if (config.encrypt_all != service->EncryptEverythingEnabled())
     return true;
 
   PrefService* pref_service = profile->GetPrefs();
   CHECK(pref_service);
 
   if (config.sync_everything !=
       pref_service->GetBoolean(prefs::kSyncKeepEverythingSynced))
     return true;
 
+  // Only check the data types that are explicitly listed on the sync
+  // preferences page.
   const syncable::ModelTypeSet& types = config.data_types;
   if (((types.find(syncable::BOOKMARKS) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncBookmarks)) ||
       ((types.find(syncable::PREFERENCES) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncPreferences)) ||
       ((types.find(syncable::THEMES) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncThemes)) ||
       ((types.find(syncable::PASSWORDS) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncPasswords)) ||
       ((types.find(syncable::AUTOFILL) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncAutofill)) ||
       ((types.find(syncable::EXTENSIONS) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncExtensions)) ||
-      ((types.find(syncable::EXTENSION_SETTINGS) != types.end()) !=
-       pref_service->GetBoolean(prefs::kSyncExtensionSettings)) ||
       ((types.find(syncable::TYPED_URLS) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncTypedUrls)) ||
       ((types.find(syncable::SESSIONS) != types.end()) !=
        pref_service->GetBoolean(prefs::kSyncSessions)) ||
       ((types.find(syncable::APPS) != types.end()) !=
-       pref_service->GetBoolean(prefs::kSyncApps)) ||
-      ((types.find(syncable::APP_SETTINGS) != types.end()) !=
-       pref_service->GetBoolean(prefs::kSyncAppSettings)))
+       pref_service->GetBoolean(prefs::kSyncApps)))
     return true;
 
   return false;
 }
 
 bool GetPassphrase(const std::string& json, std::string* passphrase) {
   scoped_ptr<Value> parsed_value(base::JSONReader::Read(json, false));
   if (!parsed_value.get() || !parsed_value->IsType(Value::TYPE_DICTIONARY))
     return false;
 
@@ skipping 319 matching lines @@
   }
 
   SyncConfiguration configuration;
   if (!GetConfiguration(json, &configuration)) {
     // The page sent us something that we didn't understand.
     // This probably indicates a programming error.
     NOTREACHED();
     return;
   }
 
+  // We do not do UMA logging during unit tests.
+  if (web_ui_) {
+    Profile* profile = Profile::FromWebUI(web_ui_);
+    if (HasConfigurationChanged(configuration, profile)) {
+      UMA_HISTOGRAM_BOOLEAN("Sync.SyncEverything",
+                            configuration.sync_everything);
+      if (!configuration.sync_everything) {
+        // Only log the data types that are explicitly listed on the sync
+        // preferences page.
+        const syncable::ModelTypeSet& types = configuration.data_types;
+        UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncBookmarks",
+            types.find(syncable::BOOKMARKS) != types.end());
+        UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncPreferences",
+            types.find(syncable::PREFERENCES) != types.end());
+        UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncThemes",
+            types.find(syncable::THEMES) != types.end());
+        UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncPasswords",
+            types.find(syncable::PASSWORDS) != types.end());
+        UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncAutofill",
+            types.find(syncable::AUTOFILL) != types.end());
+        UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncExtensions",
+            types.find(syncable::EXTENSIONS) != types.end());
+        UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncTypedUrls",
+            types.find(syncable::TYPED_URLS) != types.end());
+        UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncSessions",
+            types.find(syncable::SESSIONS) != types.end());
+        UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncApps",
+            types.find(syncable::APPS) != types.end());
+        COMPILE_ASSERT(17 == syncable::MODEL_TYPE_COUNT,
+                       UpdateCustomConfigHistogram);
+      }
+      UMA_HISTOGRAM_BOOLEAN("Sync.EncryptAllData", configuration.encrypt_all);
+      UMA_HISTOGRAM_BOOLEAN("Sync.CustomPassphrase",
+                            configuration.set_gaia_passphrase ||
+                            configuration.set_secondary_passphrase);
+    }
+  }
+
   DCHECK(flow_);
   flow_->OnUserConfigured(configuration);
 
   ProfileMetrics::LogProfileSyncInfo(ProfileMetrics::SYNC_CUSTOMIZE);
   if (configuration.encrypt_all) {
     ProfileMetrics::LogProfileSyncInfo(ProfileMetrics::SYNC_ENCRYPT);
   }
   if (configuration.set_secondary_passphrase) {
     ProfileMetrics::LogProfileSyncInfo(ProfileMetrics::SYNC_PASSPHRASE);
   }
   if (!configuration.sync_everything) {
     ProfileMetrics::LogProfileSyncInfo(ProfileMetrics::SYNC_CHOOSE);
   }
-
-  // Happens during unit tests.
-  if (!web_ui_)
-    return;
-
-  Profile* profile = Profile::FromWebUI(web_ui_);
-  if (HasConfigurationChanged(configuration, profile)) {
-    UMA_HISTOGRAM_BOOLEAN("Sync.SyncEverything",
-                          configuration.sync_everything);
-    if (!configuration.sync_everything) {
-      const syncable::ModelTypeSet& types = configuration.data_types;
-      UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncBookmarks",
-          types.find(syncable::BOOKMARKS) != types.end());
-      UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncPreferences",
-          types.find(syncable::PREFERENCES) != types.end());
-      UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncThemes",
-          types.find(syncable::THEMES) != types.end());
-      UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncPasswords",
-          types.find(syncable::PASSWORDS) != types.end());
-      UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncAutofill",
-          types.find(syncable::AUTOFILL) != types.end());
-      UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncExtensions",
-          types.find(syncable::EXTENSIONS) != types.end());
-      UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncExtensionSettings",
-          types.find(syncable::EXTENSION_SETTINGS) != types.end());
-      UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncTypedUrls",
-          types.find(syncable::TYPED_URLS) != types.end());
-      UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncSessions",
-          types.find(syncable::SESSIONS) != types.end());
-      UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncApps",
-          types.find(syncable::APPS) != types.end());
-      UMA_HISTOGRAM_BOOLEAN("Sync.CustomSyncAppSettings",
-          types.find(syncable::APP_SETTINGS) != types.end());
-      COMPILE_ASSERT(17 == syncable::MODEL_TYPE_COUNT,
-                     UpdateCustomConfigHistogram);
-    }
-    UMA_HISTOGRAM_BOOLEAN("Sync.EncryptAllData", configuration.encrypt_all);
-    UMA_HISTOGRAM_BOOLEAN("Sync.CustomPassphrase",
-                          configuration.set_gaia_passphrase ||
-                          configuration.set_secondary_passphrase);
-  }
 }
 
 void SyncSetupHandler::HandlePassphraseEntry(const ListValue* args) {
   std::string json;
   if (!args->GetString(0, &json)) {
     NOTREACHED() << "Could not read JSON argument";
     return;
   }
 
   if (json.empty())
@@ skipping 122 matching lines @@
 }
 
 void SyncSetupHandler::ShowLoginErrorMessage(const string16& error_message) {
   DictionaryValue args;
   Profile* profile = Profile::FromWebUI(web_ui_);
   ProfileSyncService* service = profile->GetProfileSyncService();
   SyncSetupFlow::GetArgsForGaiaLogin(service, &args);
   args.SetString("error_message", error_message);
   ShowGaiaLogin(args);
 }