| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <memory> | 5 #include <memory> |
| 6 #include <utility> | 6 #include <utility> |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 const Browser* const browser = browser_list->get(0); | 63 const Browser* const browser = browser_list->get(0); |
| 64 ASSERT_TRUE(browser); | 64 ASSERT_TRUE(browser); |
| 65 const TabStripModel* tabs = browser->tab_strip_model(); | 65 const TabStripModel* tabs = browser->tab_strip_model(); |
| 66 ASSERT_TRUE(tabs); | 66 ASSERT_TRUE(tabs); |
| 67 ASSERT_EQ(2, tabs->count()); | 67 ASSERT_EQ(2, tabs->count()); |
| 68 EXPECT_EQ(GURL(kStartUpURL1), tabs->GetWebContentsAt(0)->GetURL()); | 68 EXPECT_EQ(GURL(kStartUpURL1), tabs->GetWebContentsAt(0)->GetURL()); |
| 69 EXPECT_EQ(GURL(kStartUpURL2), tabs->GetWebContentsAt(1)->GetURL()); | 69 EXPECT_EQ(GURL(kStartUpURL2), tabs->GetWebContentsAt(1)->GetURL()); |
| 70 } | 70 } |
| 71 | 71 |
| 72 // Verify that the policies are honored on a new user's login. | 72 // Verify that the policies are honored on a new user's login. |
| 73 IN_PROC_BROWSER_TEST_F(RestoreOnStartupTestChromeOS, PRE_LogInAndVerify) { | 73 // Disabled https://crbug.com/694269 |
| 74 IN_PROC_BROWSER_TEST_F(RestoreOnStartupTestChromeOS, |
| 75 DISABLED_PRE_LogInAndVerify) { |
| 74 SkipToLoginScreen(); | 76 SkipToLoginScreen(); |
| 75 LogInAndVerifyStartUpURLs(); | 77 LogInAndVerifyStartUpURLs(); |
| 76 } | 78 } |
| 77 | 79 |
| 78 // Verify that the policies are honored on an existing user's login. | 80 // Verify that the policies are honored on an existing user's login. |
| 79 IN_PROC_BROWSER_TEST_F(RestoreOnStartupTestChromeOS, LogInAndVerify) { | 81 // Disabled https://crbug.com/694269 |
| 82 IN_PROC_BROWSER_TEST_F(RestoreOnStartupTestChromeOS, DISABLED_LogInAndVerify) { |
| 80 content::WindowedNotificationObserver( | 83 content::WindowedNotificationObserver( |
| 81 chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE, | 84 chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE, |
| 82 content::NotificationService::AllSources()).Wait(); | 85 content::NotificationService::AllSources()).Wait(); |
| 83 LogInAndVerifyStartUpURLs(); | 86 LogInAndVerifyStartUpURLs(); |
| 84 } | 87 } |
| 85 | 88 |
| 86 } // namespace policy | 89 } // namespace policy |
| OLD | NEW |