Clean up straggler classes to use embedded signin in page in the new profiles world.

chrome/browser/signin/signin_browsertest.cc

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_
 #define CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_
 
 #include "base/command_line.h"
 #include "chrome/browser/signin/chrome_signin_client.h"
 #include "chrome/browser/signin/chrome_signin_client_factory.h"
@@ skipping 94 matching lines @@
 #define MAYBE_ProcessIsolation DISABLED_ProcessIsolation
 #else
 #define MAYBE_ProcessIsolation ProcessIsolation
 #endif
 IN_PROC_BROWSER_TEST_F(SigninBrowserTest, MAYBE_ProcessIsolation) {
   SigninClient* signin =
       ChromeSigninClientFactory::GetForProfile(browser()->profile());
   EXPECT_FALSE(signin->HasSigninProcess());
 
   ui_test_utils::NavigateToURL(browser(), signin::GetPromoURL(
-      signin::SOURCE_NTP_LINK, true));
+      signin_metrics::SOURCE_NTP_LINK, true));
   EXPECT_EQ(kOneClickSigninEnabled, signin->HasSigninProcess());
 
   // Navigating away should change the process.
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIOmniboxURL));
   EXPECT_FALSE(signin->HasSigninProcess());
 
   ui_test_utils::NavigateToURL(browser(), signin::GetPromoURL(
-      signin::SOURCE_NTP_LINK, true));
+      signin_metrics::SOURCE_NTP_LINK, true));
   EXPECT_EQ(kOneClickSigninEnabled, signin->HasSigninProcess());
 
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   int active_tab_process_id =
       active_tab->GetRenderProcessHost()->GetID();
   EXPECT_EQ(kOneClickSigninEnabled,
             signin->IsSigninProcess(active_tab_process_id));
   EXPECT_EQ(0, active_tab->GetRenderViewHost()->GetEnabledBindings());
 
   // Entry points to signin request "SINGLETON_TAB" mode, so a new request
   // shouldn't change anything.
   chrome::NavigateParams params(chrome::GetSingletonTabNavigateParams(
       browser(),
-      GURL(signin::GetPromoURL(signin::SOURCE_NTP_LINK, false))));
+      GURL(signin::GetPromoURL(signin_metrics::SOURCE_NTP_LINK, false))));
   params.path_behavior = chrome::NavigateParams::IGNORE_AND_NAVIGATE;
   ShowSingletonTabOverwritingNTP(browser(), params);
   EXPECT_EQ(active_tab, browser()->tab_strip_model()->GetActiveWebContents());
   EXPECT_EQ(kOneClickSigninEnabled,
             signin->IsSigninProcess(active_tab_process_id));
 
   // Navigating away should change the process.
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL));
   EXPECT_FALSE(signin->IsSigninProcess(
       active_tab->GetRenderProcessHost()->GetID()));
 }
 
 #if defined (OS_MACOSX)
 // crbug.com/375197
 #define MAYBE_NotTrustedAfterRedirect DISABLED_NotTrustedAfterRedirect
 #else
 #define MAYBE_NotTrustedAfterRedirect NotTrustedAfterRedirect
 #endif
 
 IN_PROC_BROWSER_TEST_F(SigninBrowserTest, MAYBE_NotTrustedAfterRedirect) {
   SigninClient* signin =
       ChromeSigninClientFactory::GetForProfile(browser()->profile());
   EXPECT_FALSE(signin->HasSigninProcess());
 
-  GURL url = signin::GetPromoURL(signin::SOURCE_NTP_LINK, true);
+  GURL url = signin::GetPromoURL(signin_metrics::SOURCE_NTP_LINK, true);
   ui_test_utils::NavigateToURL(browser(), url);
   EXPECT_EQ(kOneClickSigninEnabled, signin->HasSigninProcess());
 
   // Navigating in a different tab should not affect the sign-in process.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), GURL(kNonSigninURL), NEW_BACKGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   EXPECT_EQ(kOneClickSigninEnabled, signin->HasSigninProcess());
 
   // Navigating away should clear the sign-in process.
@@ skipping 26 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(BackOnNTPCommitObserver);
 };
 
 // This is a test for http://crbug.com/257277. It simulates the navigations
 // that occur if the user clicks on the "Skip for now" link at the signin page
 // and initiates a back navigation between the point of Commit and
 // DidStopLoading of the NTP.
 IN_PROC_BROWSER_TEST_F(SigninBrowserTest, SigninSkipForNowAndGoBack) {
   GURL ntp_url(chrome::kChromeUINewTabURL);
-  GURL start_url = signin::GetPromoURL(signin::SOURCE_START_PAGE, false);
+  GURL start_url = signin::GetPromoURL(
+      signin_metrics::SOURCE_START_PAGE, false);
   GURL skip_url = signin::GetLandingURL("ntp", 1);
 
   SigninClient* signin =
       ChromeSigninClientFactory::GetForProfile(browser()->profile());
   EXPECT_FALSE(signin->HasSigninProcess());
 
   ui_test_utils::NavigateToURL(browser(), start_url);
   EXPECT_EQ(kOneClickSigninEnabled, signin->HasSigninProcess());
 
   content::WebContents* web_contents =
@@ skipping 20 matching lines @@
   EXPECT_EQ(skip_url, web_contents->GetLastCommittedURL());
   EXPECT_EQ(start_url, web_contents->GetVisibleURL());
 
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
   observer.Wait();
   EXPECT_EQ(start_url, web_contents->GetLastCommittedURL());
 }
 #endif  // CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_