Revert "Speculative revert by sheriff"

chrome/browser/chromeos/login/login_browsertest.cc

 // Copyright (c) 2012 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 "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "base/command_line.h"
+#include "base/json/json_file_value_serializer.h"
+#include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/login_wizard.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/tracing.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/login/user_names.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
@@ skipping 105 matching lines @@
           "document.getElementsByName('email')[0].value = '$Email';"
           "document.getElementsByName('password')[0].value = '$Password';"
           "document.getElementById('submit-button').click();"
         "})();";
     ReplaceSubstringsAfterOffset(&js, 0, "$Email", user_email);
     ReplaceSubstringsAfterOffset(&js, 0, "$Password", password);
     ExecuteJsInGaiaAuthFrame(js);
   }
 };
 
+class LoginOfflineTest : public LoginTest {
+ public:
+  LoginOfflineTest() {}
+  ~LoginOfflineTest() override {}
+
+  bool SetUpUserDataDirectory() override {
+    base::FilePath user_data_dir;
+    CHECK(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
+    base::FilePath local_state_path =
+        user_data_dir.Append(chrome::kLocalStateFilename);
+    base::DictionaryValue local_state_dict;
+
+    // Set webview disabled flag only when local state file does not exist.
+    // Otherwise, we break PRE tests that leave state in it.
+    if (!base::PathExists(local_state_path)) {
+      // TODO(rsorokin): Fix offline test for webview signin.
+      // http://crbug.com/475569
+      local_state_dict.SetBoolean(prefs::kWebviewSigninDisabled, true);
+
+      CHECK(JSONFileValueSerializer(local_state_path)
+                .Serialize(local_state_dict));
+    }
+
+    return LoginTest::SetUpUserDataDirectory();
+  }
+};
+
 // Used to make sure that the system tray is visible and within the screen
 // bounds after login.
 void TestSystemTrayIsVisible() {
   ash::SystemTray* tray = ash::Shell::GetInstance()->GetPrimarySystemTray();
   aura::Window* primary_win = ash::Shell::GetPrimaryRootWindow();
   EXPECT_TRUE(tray->visible());
   EXPECT_TRUE(primary_win->bounds().Contains(tray->GetBoundsInScreen()));
 }
 
 // After a chrome crash, the session manager will restart chrome with
@@ skipping 52 matching lines @@
 }
 
 // Verifies that the webui for login comes up successfully.
 IN_PROC_BROWSER_TEST_F(LoginSigninTest, WebUIVisible) {
   base::TimeDelta no_timeout;
   EXPECT_TRUE(tracing::WaitForWatchEvent(no_timeout));
   std::string json_events;
   ASSERT_TRUE(tracing::EndTracing(&json_events));
 }
 
-IN_PROC_BROWSER_TEST_F(LoginTest, PRE_GaiaAuthOffline) {
+IN_PROC_BROWSER_TEST_F(LoginOfflineTest, PRE_GaiaAuthOffline) {
   RegisterUser(kTestUser);
   chromeos::StartupUtils::MarkOobeCompleted();
   chromeos::CrosSettings::Get()->SetBoolean(
       chromeos::kAccountsPrefShowUserNamesOnSignIn, false);
 }
 
-IN_PROC_BROWSER_TEST_F(LoginTest, GaiaAuthOffline) {
+IN_PROC_BROWSER_TEST_F(LoginOfflineTest, GaiaAuthOffline) {
   bool show_user;
   ASSERT_TRUE(chromeos::CrosSettings::Get()->GetBoolean(
       chromeos::kAccountsPrefShowUserNamesOnSignIn, &show_user));
   ASSERT_FALSE(show_user);
 
   StartGaiaAuthOffline();
 
   chromeos::UserContext user_context(kTestUser);
   user_context.SetKey(chromeos::Key(kPassword));
   SetExpectedCredentials(user_context);
 
   content::WindowedNotificationObserver session_start_waiter(
       chrome::NOTIFICATION_SESSION_STARTED,
       content::NotificationService::AllSources());
   SubmitGaiaAuthOfflineForm(kTestUser, kPassword);
   session_start_waiter.Wait();
 
   TestSystemTrayIsVisible();
 }
 
 }  // namespace