Adding in metrics for GAIA photo info. Also, fixing avatar logging to only log when the user chan...

chrome/browser/ui/webui/options/manage_profile_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/options/manage_profile_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 156 matching lines @@
     // index.
     profile_index = cache.GetIndexOfProfileWithPath(profile_file_path);
     if (profile_index == std::string::npos)
       return;
   }
 
   std::string icon_url;
   if (!args->GetString(2, &icon_url))
     return;
 
+  // Metrics logging variable.
+  bool previously_using_gaia_icon =
+      cache.IsUsingGAIANameOfProfileAtIndex(profile_index);
+
   size_t new_icon_index;
   if (icon_url == gaia_picture_url_) {
     cache.SetIsUsingGAIAPictureOfProfileAtIndex(profile_index, true);
+    if (!previously_using_gaia_icon) {
+      // Only log if they changed to the GAIA photo.
+      ProfileMetrics::LogProfileAvatarSelection(ProfileMetrics::AVATAR_GAIA);
+      ProfileMetrics::LogProfileSwitchGaia(ProfileMetrics::GAIA_OPT_IN);
+    }
   } else if (cache.IsDefaultAvatarIconUrl(icon_url, &new_icon_index)) {
-    ProfileMetrics::LogProfileAvatarSelection(new_icon_index);
+    size_t previous_icon_index =
+        cache.GetAvatarIconIndexOfProfileAtIndex(profile_index);
+    if (previous_icon_index != new_icon_index) {
+      ProfileMetrics::LogProfileAvatarSelection(new_icon_index);
+    }
+    if (previously_using_gaia_icon) {
+      ProfileMetrics::LogProfileSwitchGaia(ProfileMetrics::GAIA_OPT_OUT);
+    }
     cache.SetAvatarIconOfProfileAtIndex(profile_index, new_icon_index);
     cache.SetIsUsingGAIAPictureOfProfileAtIndex(profile_index, false);
   }
 
   ProfileMetrics::LogProfileUpdate(profile_file_path);
 }
 
 void ManageProfileHandler::DeleteProfile(const ListValue* args) {
   DCHECK(args);
 
@@ skipping 89 matching lines @@
   if (i == std::string::npos)
     return;
   string16 gaia_name = cache.GetGAIANameOfProfileAtIndex(i);
   if (gaia_name.empty())
     return;
 
   StringValue gaia_name_value(gaia_name);
   web_ui_->CallJavascriptFunction("ManageProfileOverlay.setProfileName",
                                   gaia_name_value);
 }