| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/run_loop.h" | 5 #include "base/run_loop.h" |
| 6 #include "base/time/time.h" | 6 #include "base/time/time.h" |
| 7 #include "chrome/browser/chromeos/login/signin/merge_session_load_page.h" | 7 #include "chrome/browser/chromeos/login/signin/merge_session_load_page.h" |
| 8 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h" | 8 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h" |
| 9 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h" | 9 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h" |
| 10 #include "chrome/browser/chromeos/login/users/user_manager.h" | 10 #include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h" |
| 11 #include "chrome/browser/chromeos/settings/cros_settings.h" | 11 #include "chrome/browser/chromeos/settings/cros_settings.h" |
| 12 #include "chrome/browser/chromeos/settings/device_settings_service.h" | 12 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
| 13 #include "chrome/test/base/chrome_render_view_host_test_harness.h" | 13 #include "chrome/test/base/chrome_render_view_host_test_harness.h" |
| 14 #include "components/user_manager/user_manager.h" |
| 14 #include "content/public/browser/interstitial_page.h" | 15 #include "content/public/browser/interstitial_page.h" |
| 15 #include "content/public/browser/navigation_controller.h" | 16 #include "content/public/browser/navigation_controller.h" |
| 16 #include "content/public/browser/web_contents.h" | 17 #include "content/public/browser/web_contents.h" |
| 17 #include "content/public/test/web_contents_tester.h" | 18 #include "content/public/test/web_contents_tester.h" |
| 18 | 19 |
| 19 using content::InterstitialPage; | 20 using content::InterstitialPage; |
| 20 using content::WebContents; | 21 using content::WebContents; |
| 21 using content::WebContentsTester; | 22 using content::WebContentsTester; |
| 22 | 23 |
| 23 namespace { | 24 namespace { |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 | 175 |
| 175 // The URL remains to be URL2. | 176 // The URL remains to be URL2. |
| 176 EXPECT_EQ(kURL2, web_contents()->GetVisibleURL().spec()); | 177 EXPECT_EQ(kURL2, web_contents()->GetVisibleURL().spec()); |
| 177 | 178 |
| 178 // Commit navigation and the interstitial page is gone. | 179 // Commit navigation and the interstitial page is gone. |
| 179 Navigate(kURL2, 2); | 180 Navigate(kURL2, 2); |
| 180 EXPECT_FALSE(GetMergeSessionLoadPage()); | 181 EXPECT_FALSE(GetMergeSessionLoadPage()); |
| 181 } | 182 } |
| 182 | 183 |
| 183 } // namespace chromeos | 184 } // namespace chromeos |
| OLD | NEW |