While trying to enable webview sign-in by default, I found a bunch of issues

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"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/content_switches.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"
@@ skipping 69 matching lines @@
 const bool kOneClickSigninEnabled = false;
 #endif
 
 // Disabled on Windows due to flakiness. http://crbug.com/249055
 #if defined(OS_WIN)
 #define MAYBE_ProcessIsolation DISABLED_ProcessIsolation
 #else
 #define MAYBE_ProcessIsolation ProcessIsolation
 #endif
 IN_PROC_BROWSER_TEST_F(SigninBrowserTest, MAYBE_ProcessIsolation) {
+  // This test is not needed for the webview based sign-in code.
+  if (switches::IsEnableWebviewBasedSignin())
+    return;
+
   SigninClient* signin =
       ChromeSigninClientFactory::GetForProfile(browser()->profile());
   EXPECT_FALSE(signin->HasSigninProcess());
 
   ui_test_utils::NavigateToURL(browser(), signin::GetPromoURL(
       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));
@@ skipping 29 matching lines @@
 }
 
 #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) {
+  // This test is not needed for the webview based sign-in code.
+  if (switches::IsEnableWebviewBasedSignin())
+    return;
+
   SigninClient* signin =
       ChromeSigninClientFactory::GetForProfile(browser()->profile());
   EXPECT_FALSE(signin->HasSigninProcess());
 
   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(
@@ skipping 30 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) {
+  // This test is not needed for the webview based sign-in code.
+  // OneClickSigninHelper is not used.
+  if (switches::IsEnableWebviewBasedSignin())
+    return;
+
   GURL ntp_url(chrome::kChromeUINewTabURL);
   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);
@@ skipping 23 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_