| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "chrome/browser/signin/signin_promo.h" | 6 #include "chrome/browser/signin/signin_promo.h" |
| 7 #include "chrome/browser/ui/browser.h" | 7 #include "chrome/browser/ui/browser.h" |
| 8 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 8 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 9 #include "chrome/browser/ui/webui/signin/inline_login_ui.h" | 9 #include "chrome/browser/ui/webui/signin/inline_login_ui.h" |
| 10 #include "chrome/browser/ui/webui/signin/login_ui_service.h" | 10 #include "chrome/browser/ui/webui/signin/login_ui_service.h" |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 | 84 |
| 85 const char kFooWebUIURL[] = "chrome://foo/"; | 85 const char kFooWebUIURL[] = "chrome://foo/"; |
| 86 | 86 |
| 87 } // namespace | 87 } // namespace |
| 88 | 88 |
| 89 class InlineLoginUIBrowserTest : public InProcessBrowserTest { | 89 class InlineLoginUIBrowserTest : public InProcessBrowserTest { |
| 90 public: | 90 public: |
| 91 InlineLoginUIBrowserTest() {} | 91 InlineLoginUIBrowserTest() {} |
| 92 }; | 92 }; |
| 93 | 93 |
| 94 #if defined(OS_LINUX) | 94 IN_PROC_BROWSER_TEST_F(InlineLoginUIBrowserTest, DifferentStorageId) { |
| 95 // crbug.com/422868 | |
| 96 #define MAYBE_DifferentStorageId DISABLED_DifferentStorageId | |
| 97 #else | |
| 98 #define MAYBE_DifferentStorageId DifferentStorageId | |
| 99 #endif | |
| 100 IN_PROC_BROWSER_TEST_F(InlineLoginUIBrowserTest, MAYBE_DifferentStorageId) { | |
| 101 GURL test_url = ui_test_utils::GetTestUrl( | 95 GURL test_url = ui_test_utils::GetTestUrl( |
| 102 base::FilePath(base::FilePath::kCurrentDirectory), | 96 base::FilePath(base::FilePath::kCurrentDirectory), |
| 103 base::FilePath(FILE_PATH_LITERAL("title1.html"))); | 97 base::FilePath(FILE_PATH_LITERAL("title1.html"))); |
| 104 | 98 |
| 105 ContentInfo info1 = | 99 ContentInfo info1 = |
| 106 NavigateAndGetInfo(browser(), test_url, CURRENT_TAB); | 100 NavigateAndGetInfo(browser(), test_url, CURRENT_TAB); |
| 107 ContentInfo info2 = | 101 ContentInfo info2 = |
| 108 NavigateAndGetInfo(browser(), | 102 NavigateAndGetInfo(browser(), |
| 109 signin::GetPromoURL(signin::SOURCE_START_PAGE, false), | 103 signin::GetPromoURL(signin::SOURCE_START_PAGE, false), |
| 110 CURRENT_TAB); | 104 CURRENT_TAB); |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 std::string js = | 314 std::string js = |
| 321 "document.getElementById('Email').value = 'email';" | 315 "document.getElementById('Email').value = 'email';" |
| 322 "document.getElementById('Passwd').value = 'password';" | 316 "document.getElementById('Passwd').value = 'password';" |
| 323 "document.getElementById('signIn').click();"; | 317 "document.getElementById('signIn').click();"; |
| 324 ExecuteJsInSigninFrame(js); | 318 ExecuteJsInSigninFrame(js); |
| 325 | 319 |
| 326 run_loop.Run(); | 320 run_loop.Run(); |
| 327 base::MessageLoop::current()->RunUntilIdle(); | 321 base::MessageLoop::current()->RunUntilIdle(); |
| 328 } | 322 } |
| 329 #endif // OS_CHROMEOS | 323 #endif // OS_CHROMEOS |
| OLD | NEW |