Implement newly designed sign-in related histograms for desktop platorms.

chrome/browser/ui/webui/signin/login_ui_test_utils.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/signin/signin_promo.h"
 #include "chrome/browser/signin/signin_tracker_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/signin/inline_login_ui.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 188 matching lines @@
   if (ElementExistsInSigninFrame(browser, "next"))
     SigninInNewGaiaFlow(browser, email, password);
   else
     SigninInOldGaiaFlow(browser, email, password);
 }
 
 bool SignInWithUI(Browser* browser,
                   const std::string& username,
                   const std::string& password,
                   bool wait_for_account_cookies,
-                  signin_metrics::Source signin_source) {
+                  signin_metrics::AccessPoint access_point) {
   SignInObserver signin_observer(wait_for_account_cookies);
   scoped_ptr<SigninTracker> tracker =
       SigninTrackerFactory::CreateForProfile(browser->profile(),
                                              &signin_observer);
 
-  GURL signin_url = signin::GetPromoURL(signin_source, false);
+  GURL signin_url = signin::GetPromoURL(
+      access_point, signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, false);
   DVLOG(1) << "Navigating to " << signin_url;
   // For some tests, the window is not shown yet and this might be the first tab
   // navigation, so GetActiveWebContents() for CURRENT_TAB is NULL. That's why
   // we use NEW_FOREGROUND_TAB rather than the CURRENT_TAB used by default in
   // ui_test_utils::NavigateToURL().
   ui_test_utils::NavigateToURLWithDisposition(
         browser,
         signin_url,
         NEW_FOREGROUND_TAB,
         ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
 
   DVLOG(1) << "Wait for login UI to be ready.";
   WaitUntilUIReady(browser);
   DVLOG(1) << "Sign in user: " << username;
   ExecuteJsToSigninInSigninFrame(browser, username, password);
   signin_observer.Wait();
   return signin_observer.DidSignIn();
 }
 
 bool SignInWithUI(Browser* browser,
                   const std::string& username,
                   const std::string& password) {
   return SignInWithUI(browser, username, password,
-                      false  /* wait_for_account_cookies */,
-                      signin_metrics::SOURCE_START_PAGE);
+                      false /* wait_for_account_cookies */,
+                      signin_metrics::ACCESS_POINT_START_PAGE);
 }
 
 }  // namespace login_ui_test_utils