Remove enable-iframe-based-signin flag.

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 "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
@@ skipping 292 matching lines @@
   local_state->SetString(prefs::kGoogleServicesUsernamePattern, pattern);
 }
 
 #if defined(OS_LINUX) || defined(OS_WIN)
 // crbug.com/422868
 #define MAYBE_DifferentStorageId DISABLED_DifferentStorageId
 #else
 #define MAYBE_DifferentStorageId DifferentStorageId
 #endif
 IN_PROC_BROWSER_TEST_F(InlineLoginUIBrowserTest, MAYBE_DifferentStorageId) {
-  if (switches::IsEnableWebviewBasedSignin()) {
-    ContentInfo info =
-        NavigateAndGetInfo(browser(), GetSigninPromoURL(), CURRENT_TAB);
-    WaitUntilUIReady(browser());
+  ContentInfo info =
+      NavigateAndGetInfo(browser(), GetSigninPromoURL(), CURRENT_TAB);
+  WaitUntilUIReady(browser());
 
-    // Make sure storage partition of embedded webview is different from
-    // parent.
-    std::set<content::WebContents*> set;
-    GuestViewManager* manager = GuestViewManager::FromBrowserContext(
-        info.contents->GetBrowserContext());
-    manager->ForEachGuest(info.contents, base::Bind(&AddToSet, &set));
-    ASSERT_EQ(1u, set.size());
-    content::WebContents* webview_contents = *set.begin();
-    content::RenderProcessHost* process =
-        webview_contents->GetRenderProcessHost();
-    ASSERT_NE(info.pid, process->GetID());
-    ASSERT_NE(info.storage_partition, process->GetStoragePartition());
-  } else {
-    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(), GetSigninPromoURL(), CURRENT_TAB);
-    NavigateAndGetInfo(browser(), test_url, CURRENT_TAB);
-    ContentInfo info3 =
-        NavigateAndGetInfo(browser(), GetSigninPromoURL(), 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);
-  }
+  // Make sure storage partition of embedded webview is different from
+  // parent.
+  std::set<content::WebContents*> set;
+  GuestViewManager* manager = GuestViewManager::FromBrowserContext(
+      info.contents->GetBrowserContext());
+  manager->ForEachGuest(info.contents, base::Bind(&AddToSet, &set));
+  ASSERT_EQ(1u, set.size());
+  content::WebContents* webview_contents = *set.begin();
+  content::RenderProcessHost* process =
+      webview_contents->GetRenderProcessHost();
+  ASSERT_NE(info.pid, process->GetID());
+  ASSERT_NE(info.storage_partition, process->GetStoragePartition());
 }
 
 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!")));
 
@@ skipping 550 matching lines @@
       ->AddObserver(&observer);
   base::RunLoop run_loop;
   EXPECT_CALL(observer, OnUntrustedLoginUIShown())
       .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
 
   ExecuteJsToSigninInSigninFrame(browser(), "email@gmail.com", "password");
   run_loop.Run();
   base::MessageLoop::current()->RunUntilIdle();
 }
 #endif // OS_CHROMEOS