Add Profile metric counting to new User Manager.

chrome/browser/profiles/avatar_menu.cc

 // Copyright (c) 2012 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/profiles/avatar_menu.h"
 
 #include "ash/ash_switches.h"
 #include "base/bind.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/field_trial.h"
@@ skipping 97 matching lines @@
 #endif
   }
   return false;
 }
 
 bool AvatarMenu::CompareItems(const Item* item1, const Item* item2) {
   return base::i18n::ToLower(item1->name).compare(
       base::i18n::ToLower(item2->name)) < 0;
 }
 
-void AvatarMenu::SwitchToProfile(size_t index, bool always_create) {
+void AvatarMenu::SwitchToProfile(
+    size_t index, bool always_create, ProfileMetrics::ProfileOpen metric) {

[Alexei Svitkine (slow), 2014/01/28 16:25:31]

If you wrap params, it should be 1 per line.

[bcwhite, 2014/01/28 17:03:03]

Done.

   DCHECK(profiles::IsMultipleProfilesEnabled() ||
          index == GetActiveProfileIndex());
   const Item& item = GetItemAt(index);
 
   if (switches::IsNewProfileManagement()) {
     // Don't open a browser window for signed-out profiles.
     if (item.signin_required) {
       chrome::ShowUserManager(item.profile_path);
       return;
     }
   }
 
   base::FilePath path =
       profile_info_->GetPathOfProfileAtIndex(item.profile_index);
 
   chrome::HostDesktopType desktop_type = chrome::GetActiveDesktop();
   if (browser_)
     desktop_type = browser_->host_desktop_type();
 
   profiles::SwitchToProfile(path, desktop_type, always_create,
-                            profiles::ProfileSwitchingDoneCallback());
-  ProfileMetrics::LogProfileSwitchUser(ProfileMetrics::SWITCH_PROFILE_ICON);
+                            profiles::ProfileSwitchingDoneCallback(),
+                            metric);
 }
 
 void AvatarMenu::AddNewProfile(ProfileMetrics::ProfileAdd type) {
   menu_actions_->AddNewProfile(type);
 }
 
 void AvatarMenu::EditProfile(size_t index) {
   // Get the index in the profile cache from the menu index.
   size_t profile_index = profile_list_->GetItemAt(index).profile_index;
 
@@ skipping 74 matching lines @@
 }
 
 void AvatarMenu::Observe(int type,
                          const content::NotificationSource& source,
                          const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED, type);
   RebuildMenu();
   if (observer_)
     observer_->OnAvatarMenuChanged(this);
 }