Add Profile metric counting to new User Manager.

chrome/browser/profiles/profile_manager_browsertest.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_info_cache_observer.h"
@@ skipping 260 matching lines @@
   // by OnUnblockOnProfileCreation when the profile is created.
   content::RunMessageLoop();
 
   chrome::HostDesktopType desktop_type = chrome::GetActiveDesktop();
   BrowserList* browser_list = BrowserList::GetInstance(desktop_type);
   ASSERT_EQ(cache.GetNumberOfProfiles(), 2U);
   EXPECT_EQ(1U, browser_list->size());
 
   // Open a browser window for the first profile.
   profiles::SwitchToProfile(path_profile1, desktop_type, false,
-                            kOnProfileSwitchDoNothing);
+                            kOnProfileSwitchDoNothing,
+                            ProfileMetrics::SWITCH_PROFILE_ICON);
   EXPECT_EQ(chrome::GetTotalBrowserCount(), 1U);
   EXPECT_EQ(1U, browser_list->size());
   EXPECT_EQ(path_profile1, browser_list->get(0)->profile()->GetPath());
 
   // Open a browser window for the second profile.
   profiles::SwitchToProfile(path_profile2, desktop_type, false,
-                            kOnProfileSwitchDoNothing);
+                            kOnProfileSwitchDoNothing,
+                            ProfileMetrics::SWITCH_PROFILE_ICON);
   EXPECT_EQ(chrome::GetTotalBrowserCount(), 2U);
   EXPECT_EQ(2U, browser_list->size());
   EXPECT_EQ(path_profile2, browser_list->get(1)->profile()->GetPath());
 
   // Switch to the first profile without opening a new window.
   profiles::SwitchToProfile(path_profile1, desktop_type, false,
-                            kOnProfileSwitchDoNothing);
+                            kOnProfileSwitchDoNothing,
+                            ProfileMetrics::SWITCH_PROFILE_ICON);
   EXPECT_EQ(chrome::GetTotalBrowserCount(), 2U);
   EXPECT_EQ(2U, browser_list->size());
 
   EXPECT_EQ(path_profile1, browser_list->get(0)->profile()->GetPath());
   EXPECT_EQ(path_profile2, browser_list->get(1)->profile()->GetPath());
 }
 
 // This test used to be flakily timing out on Windows: http://crbug.com/314905.
 // If this happens again please make it a MAYBE_ test and reopen that bug.
 IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, EphemeralProfile) {
@@ skipping 25 matching lines @@
   // Spin to allow profile creation to take place.
   content::RunMessageLoop();
 
   chrome::HostDesktopType desktop_type = chrome::GetActiveDesktop();
   BrowserList* browser_list = BrowserList::GetInstance(desktop_type);
   ASSERT_EQ(2U, cache.GetNumberOfProfiles());
   EXPECT_EQ(1U, browser_list->size());
 
   // Open a browser window for the second profile.
   profiles::SwitchToProfile(path_profile2, desktop_type, false,
-                            kOnProfileSwitchDoNothing);
+                            kOnProfileSwitchDoNothing,
+                            ProfileMetrics::SWITCH_PROFILE_ICON);
   EXPECT_EQ(2U, chrome::GetTotalBrowserCount());
   EXPECT_EQ(2U, browser_list->size());
   EXPECT_EQ(path_profile2, browser_list->get(1)->profile()->GetPath());
 
   // Create a second window for the ephemeral profile.
   profiles::SwitchToProfile(path_profile2, desktop_type, true,
-                            kOnProfileSwitchDoNothing);
+                            kOnProfileSwitchDoNothing,
+                            ProfileMetrics::SWITCH_PROFILE_ICON);
   EXPECT_EQ(3U, chrome::GetTotalBrowserCount());
   EXPECT_EQ(3U, browser_list->size());
 
   EXPECT_EQ(path_profile1, browser_list->get(0)->profile()->GetPath());
   EXPECT_EQ(path_profile2, browser_list->get(1)->profile()->GetPath());
   EXPECT_EQ(path_profile2, browser_list->get(2)->profile()->GetPath());
 
   // Closing the first window of the ephemeral profile should not delete it.
   browser_list->get(2)->window()->Close();
   content::RunAllPendingInMessageLoop();
   EXPECT_EQ(2U, browser_list->size());
   ASSERT_EQ(2U, cache.GetNumberOfProfiles());
 
   // The second should though.
   browser_list->get(1)->window()->Close();
   content::RunAllPendingInMessageLoop();
   EXPECT_EQ(1U, browser_list->size());
   ASSERT_EQ(1U, cache.GetNumberOfProfiles());
 }