| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/macros.h" |
| 7 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| 10 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
| 11 #include "chrome/browser/ui/login/login_prompt.h" | 12 #include "chrome/browser/ui/login/login_prompt.h" |
| 12 #include "chrome/browser/ui/login/login_prompt_test_utils.h" | 13 #include "chrome/browser/ui/login/login_prompt_test_utils.h" |
| 13 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 14 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 14 #include "chrome/test/base/in_process_browser_test.h" | 15 #include "chrome/test/base/in_process_browser_test.h" |
| 15 #include "chrome/test/base/ui_test_utils.h" | 16 #include "chrome/test/base/ui_test_utils.h" |
| 16 #include "content/public/browser/navigation_controller.h" | 17 #include "content/public/browser/navigation_controller.h" |
| (...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 // disallows connections to unencrypted WebSockets from encrypted pages. | 338 // disallows connections to unencrypted WebSockets from encrypted pages. |
| 338 GURL http_url = | 339 GURL http_url = |
| 339 http_server.GetURL("/websocket/check-hsts.html#" + ws_url.spec()); | 340 http_server.GetURL("/websocket/check-hsts.html#" + ws_url.spec()); |
| 340 | 341 |
| 341 ui_test_utils::NavigateToURL(browser(), http_url); | 342 ui_test_utils::NavigateToURL(browser(), http_url); |
| 342 | 343 |
| 343 EXPECT_EQ("PASS", WaitAndGetTitle()); | 344 EXPECT_EQ("PASS", WaitAndGetTitle()); |
| 344 } | 345 } |
| 345 | 346 |
| 346 } // namespace | 347 } // namespace |
| OLD | NEW |