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

chrome/browser/ui/webui/signin/inline_login_ui_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.
 
 #include "base/command_line.h"
 #include "chrome/browser/signin/signin_promo.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/browser/ui/webui/signin/login_ui_service.h"
@@ skipping 90 matching lines @@
 #else
 #define MAYBE_DifferentStorageId DifferentStorageId
 #endif
 IN_PROC_BROWSER_TEST_F(InlineLoginUIBrowserTest, MAYBE_DifferentStorageId) {
   GURL test_url = ui_test_utils::GetTestUrl(
       base::FilePath(base::FilePath::kCurrentDirectory),
       base::FilePath(FILE_PATH_LITERAL("title1.html")));
 
   ContentInfo info1 =
       NavigateAndGetInfo(browser(), test_url, CURRENT_TAB);
-  ContentInfo info2 =
-      NavigateAndGetInfo(browser(),
-                         signin::GetPromoURL(signin::SOURCE_START_PAGE, false),
-                         CURRENT_TAB);
+  ContentInfo info2 = NavigateAndGetInfo(
+      browser(),
+      signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false),
+      CURRENT_TAB);
   NavigateAndGetInfo(browser(), test_url, CURRENT_TAB);
-  ContentInfo info3 =
-      NavigateAndGetInfo(browser(),
-                         signin::GetPromoURL( signin::SOURCE_START_PAGE, false),
-                         NEW_FOREGROUND_TAB);
+  ContentInfo info3 = NavigateAndGetInfo(
+      browser(),
+      signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false),
+      NEW_FOREGROUND_TAB);
 
   // The info for signin should be the same.
   ASSERT_EQ(info2.storage_partition, info3.storage_partition);
   // The info for test_url and signin should be different.
   ASSERT_NE(info1.storage_partition, info2.storage_partition);
 }
 
 IN_PROC_BROWSER_TEST_F(InlineLoginUIBrowserTest, OneProcessLimit) {
   GURL test_url_1 = ui_test_utils::GetTestUrl(
       base::FilePath(base::FilePath::kCurrentDirectory),
       base::FilePath(FILE_PATH_LITERAL("title1.html")));
   GURL test_url_2 = ui_test_utils::GetTestUrl(
       base::FilePath(base::FilePath::kCurrentDirectory),
       base::FilePath(FILE_PATH_LITERAL("data:text/html,Hello world!")));
 
   // Even when the process limit is set to one, the signin process should
   // still be given its own process and storage partition.
   content::RenderProcessHost::SetMaxRendererProcessCount(1);
 
   ContentInfo info1 =
       NavigateAndGetInfo(browser(), test_url_1, CURRENT_TAB);
   ContentInfo info2 =
       NavigateAndGetInfo(browser(), test_url_2, CURRENT_TAB);
-  ContentInfo info3 =
-      NavigateAndGetInfo(browser(),
-                         signin::GetPromoURL( signin::SOURCE_START_PAGE, false),
-                         CURRENT_TAB);
+  ContentInfo info3 = NavigateAndGetInfo(
+      browser(),
+      signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false),
+      CURRENT_TAB);
 
   ASSERT_EQ(info1.pid, info2.pid);
   ASSERT_NE(info1.pid, info3.pid);
 }
 
 class InlineLoginUISafeIframeBrowserTest : public InProcessBrowserTest {
  public:
   FooWebUIProvider& foo_provider() { return foo_provider_; }
 
  private:
@@ skipping 43 matching lines @@
 IN_PROC_BROWSER_TEST_F(InlineLoginUISafeIframeBrowserTest, Basic) {
   const GURL kUrl(kFooWebUIURL);
   EXPECT_CALL(foo_provider(), NewWebUI(_, ::testing::Eq(kUrl)))
       .WillOnce(ReturnNewWebUI());
   ui_test_utils::NavigateToURL(browser(), GURL(kFooWebUIURL));
 }
 
 // Make sure that the foo webui handler does not get created when we try to
 // load it inside the iframe of the login ui.
 IN_PROC_BROWSER_TEST_F(InlineLoginUISafeIframeBrowserTest, NoWebUIInIframe) {
-  GURL url = signin::GetPromoURL(signin::SOURCE_START_PAGE, false).
+  GURL url = signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false).
       Resolve("?source=0&frameUrl=chrome://foo");
   EXPECT_CALL(foo_provider(), NewWebUI(_, _)).Times(0);
   ui_test_utils::NavigateToURL(browser(), url);
 }
 
 // Flaky on CrOS, http://crbug.com/364759.
 #if defined(OS_CHROMEOS)
 #define MAYBE_TopFrameNavigationDisallowed DISABLED_TopFrameNavigationDisallowed
 #else
 #define MAYBE_TopFrameNavigationDisallowed TopFrameNavigationDisallowed
 #endif
 
 // Make sure that the gaia iframe cannot trigger top-frame navigation.
 // TODO(guohui): flaky on trybot crbug/364759.
 IN_PROC_BROWSER_TEST_F(InlineLoginUISafeIframeBrowserTest,
     MAYBE_TopFrameNavigationDisallowed) {
   // Loads into gaia iframe a web page that attempts to deframe on load.
   GURL deframe_url(embedded_test_server()->GetURL("/login/deframe.html"));
   GURL url(net::AppendOrReplaceQueryParameter(
-      signin::GetPromoURL(signin::SOURCE_START_PAGE, false),
+      signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false),
       "frameUrl", deframe_url.spec()));
   ui_test_utils::NavigateToURL(browser(), url);
   WaitUntilUIReady(browser());
 
   content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_EQ(url, contents->GetVisibleURL());
 
   content::NavigationController& controller = contents->GetController();
   EXPECT_TRUE(controller.GetPendingEntry() == NULL);
 }
 
 // Flaky on CrOS, http://crbug.com/364759.
 // Also flaky on Mac, http://crbug.com/442674.
 #if defined(OS_CHROMEOS) || defined(OS_MACOSX)
 #define MAYBE_NavigationToOtherChromeURLDisallowed \
     DISABLED_NavigationToOtherChromeURLDisallowed
 #else
 #define MAYBE_NavigationToOtherChromeURLDisallowed \
     NavigationToOtherChromeURLDisallowed
 #endif
 
 IN_PROC_BROWSER_TEST_F(InlineLoginUISafeIframeBrowserTest,
     MAYBE_NavigationToOtherChromeURLDisallowed) {
   ui_test_utils::NavigateToURL(
-      browser(), signin::GetPromoURL(signin::SOURCE_START_PAGE, false));
+      browser(), signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false));
   WaitUntilUIReady(browser());
 
   content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(content::ExecuteScript(
       contents, "window.location.href = 'chrome://foo'"));
 
   content::TestNavigationObserver navigation_observer(contents, 1);
   navigation_observer.Wait();
 
   EXPECT_EQ(GURL("about:blank"), contents->GetVisibleURL());
 }
 
 #if !defined(OS_CHROMEOS)
 IN_PROC_BROWSER_TEST_F(InlineLoginUISafeIframeBrowserTest,
     ConfirmationRequiredForNonsecureSignin) {
   FakeGaia fake_gaia;
   fake_gaia.Initialize();
 
   embedded_test_server()->RegisterRequestHandler(
       base::Bind(&FakeGaia::HandleRequest,
                  base::Unretained(&fake_gaia)));
   fake_gaia.SetFakeMergeSessionParams(
       "email", "fake-sid-cookie", "fake-lsid-cookie");
 
   // Navigates to the Chrome signin page which loads the fake gaia auth page.
   // Since the fake gaia auth page is served over HTTP, thus expects to see an
   // untrusted signin confirmation dialog upon submitting credentials below.
   ui_test_utils::NavigateToURL(
-      browser(), signin::GetPromoURL(signin::SOURCE_START_PAGE, false));
+      browser(), signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false));
   WaitUntilUIReady(browser());
 
   MockLoginUIObserver observer;
   LoginUIServiceFactory::GetForProfile(browser()->profile())
       ->AddObserver(&observer);
   base::RunLoop run_loop;
   EXPECT_CALL(observer, OnUntrustedLoginUIShown())
       .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
 
   ExecuteJsToSigninInSigninFrame(browser(), "email", "password");
   run_loop.Run();
   base::MessageLoop::current()->RunUntilIdle();
 }
 #endif // OS_CHROMEOS