| 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 "base/file_util.h" | 5 #include "base/file_util.h" |
| 6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
| 7 #include "base/test/test_timeouts.h" | 7 #include "base/test/test_timeouts.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "content/public/common/content_switches.h" | 9 #include "content/public/common/content_switches.h" |
| 10 #include "content/common/pepper_plugin_registry.h" | 10 #include "content/common/pepper_plugin_registry.h" |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 break; | 106 break; |
| 107 } | 107 } |
| 108 FilePath web_dir; | 108 FilePath web_dir; |
| 109 for (size_t tmp_itr = match; tmp_itr < src_size; ++tmp_itr) { | 109 for (size_t tmp_itr = match; tmp_itr < src_size; ++tmp_itr) { |
| 110 web_dir = web_dir.Append(FILE_PATH_LITERAL("..")); | 110 web_dir = web_dir.Append(FILE_PATH_LITERAL("..")); |
| 111 } | 111 } |
| 112 for (; match < exe_size; ++match) { | 112 for (; match < exe_size; ++match) { |
| 113 web_dir = web_dir.Append(exe_parts[match]); | 113 web_dir = web_dir.Append(exe_parts[match]); |
| 114 } | 114 } |
| 115 | 115 |
| 116 net::TestServer test_server(net::TestServer::TYPE_HTTP, web_dir); | 116 net::TestServer test_server(net::TestServer::TYPE_HTTP, |
| 117 net::TestServer::kLocalhost, |
| 118 web_dir); |
| 117 ASSERT_TRUE(test_server.Start()); | 119 ASSERT_TRUE(test_server.Start()); |
| 118 std::string query = BuildQuery("files/test_case.html?", test_case); | 120 std::string query = BuildQuery("files/test_case.html?", test_case); |
| 119 | 121 |
| 120 scoped_refptr<TabProxy> tab = GetActiveTab(); | 122 scoped_refptr<TabProxy> tab = GetActiveTab(); |
| 121 GURL url = test_server.GetURL(query); | 123 GURL url = test_server.GetURL(query); |
| 122 EXPECT_TRUE(tab->NavigateToURLBlockUntilNavigationsComplete(url, 1)); | 124 EXPECT_TRUE(tab->NavigateToURLBlockUntilNavigationsComplete(url, 1)); |
| 123 RunTestURL(tab, url); | 125 RunTestURL(tab, url); |
| 124 } | 126 } |
| 125 | 127 |
| 126 void RunTestWithWebSocketServer(const std::string& test_case) { | 128 void RunTestWithWebSocketServer(const std::string& test_case) { |
| (...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 858 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_OutOfRangeAccess) | 860 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_OutOfRangeAccess) |
| 859 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_EmptyArray) | 861 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_EmptyArray) |
| 860 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_InvalidElement) | 862 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_InvalidElement) |
| 861 | 863 |
| 862 TEST_PPAPI_IN_PROCESS(FlashMessageLoop_Basics) | 864 TEST_PPAPI_IN_PROCESS(FlashMessageLoop_Basics) |
| 863 TEST_PPAPI_IN_PROCESS(FlashMessageLoop_RunWithoutQuit) | 865 TEST_PPAPI_IN_PROCESS(FlashMessageLoop_RunWithoutQuit) |
| 864 TEST_PPAPI_OUT_OF_PROCESS(FlashMessageLoop_Basics) | 866 TEST_PPAPI_OUT_OF_PROCESS(FlashMessageLoop_Basics) |
| 865 TEST_PPAPI_OUT_OF_PROCESS(FlashMessageLoop_RunWithoutQuit) | 867 TEST_PPAPI_OUT_OF_PROCESS(FlashMessageLoop_RunWithoutQuit) |
| 866 | 868 |
| 867 #endif // ADDRESS_SANITIZER | 869 #endif // ADDRESS_SANITIZER |
| OLD | NEW |