| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 <sstream> | 5 #include <sstream> |
| 6 #include <string> | 6 #include <string> |
| 7 | 7 |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 | 70 |
| 71 TEST_F(ResourceDispatcherTest, ContentDispositionEmpty) { | 71 TEST_F(ResourceDispatcherTest, ContentDispositionEmpty) { |
| 72 CheckTitleTest(L"content-disposition-empty.html", L"success", 1); | 72 CheckTitleTest(L"content-disposition-empty.html", L"success", 1); |
| 73 } | 73 } |
| 74 | 74 |
| 75 TEST_F(ResourceDispatcherTest, ContentDispositionInline) { | 75 TEST_F(ResourceDispatcherTest, ContentDispositionInline) { |
| 76 CheckTitleTest(L"content-disposition-inline.html", L"success", 1); | 76 CheckTitleTest(L"content-disposition-inline.html", L"success", 1); |
| 77 } | 77 } |
| 78 | 78 |
| 79 // Test for bug #1091358. | 79 // Test for bug #1091358. |
| 80 // Flakey due to NavigateToURL bug: see http://crbug.com/55380 | 80 // Flaky: http://crbug.com/62595 |
| 81 TEST_F(ResourceDispatcherTest, FLAKY_SyncXMLHttpRequest) { | 81 TEST_F(ResourceDispatcherTest, FLAKY_SyncXMLHttpRequest) { |
| 82 net::TestServer test_server(net::TestServer::TYPE_HTTP, | 82 net::TestServer test_server(net::TestServer::TYPE_HTTP, |
| 83 FilePath(FILE_PATH_LITERAL("chrome/test/data"))); | 83 FilePath(FILE_PATH_LITERAL("chrome/test/data"))); |
| 84 ASSERT_TRUE(test_server.Start()); | 84 ASSERT_TRUE(test_server.Start()); |
| 85 | 85 |
| 86 scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); | 86 scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); |
| 87 ASSERT_TRUE(browser_proxy.get()); | 87 ASSERT_TRUE(browser_proxy.get()); |
| 88 scoped_refptr<TabProxy> tab(browser_proxy->GetActiveTab()); | 88 scoped_refptr<TabProxy> tab(browser_proxy->GetActiveTab()); |
| 89 ASSERT_TRUE(tab.get()); | 89 ASSERT_TRUE(tab.get()); |
| 90 ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, | 90 ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, |
| (...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 325 GURL broken_url("chrome://theme"); | 325 GURL broken_url("chrome://theme"); |
| 326 ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(broken_url)); | 326 ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(broken_url)); |
| 327 | 327 |
| 328 // Make sure the navigation finishes. | 328 // Make sure the navigation finishes. |
| 329 std::wstring tab_title; | 329 std::wstring tab_title; |
| 330 EXPECT_TRUE(tab->GetTabTitle(&tab_title)); | 330 EXPECT_TRUE(tab->GetTabTitle(&tab_title)); |
| 331 EXPECT_EQ(L"chrome://theme/ is not available", tab_title); | 331 EXPECT_EQ(L"chrome://theme/ is not available", tab_title); |
| 332 } | 332 } |
| 333 | 333 |
| 334 } // namespace | 334 } // namespace |
| OLD | NEW |