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 "base/file_util.h" | 5 #include "base/file_util.h" |
6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 #include "chrome/common/chrome_switches.h" | 8 #include "chrome/common/chrome_switches.h" |
9 #include "chrome/test/automation/tab_proxy.h" | 9 #include "chrome/test/automation/tab_proxy.h" |
10 #include "chrome/test/ui/ui_test.h" | 10 #include "chrome/test/ui/ui_test.h" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 | 67 |
68 GURL::Replacements replacements; | 68 GURL::Replacements replacements; |
69 replacements.SetQuery(test_case.c_str(), | 69 replacements.SetQuery(test_case.c_str(), |
70 url_parse::Component(0, test_case.size())); | 70 url_parse::Component(0, test_case.size())); |
71 GURL test_url = net::FilePathToFileURL(test_path); | 71 GURL test_url = net::FilePathToFileURL(test_path); |
72 RunTestURL(test_url.ReplaceComponents(replacements)); | 72 RunTestURL(test_url.ReplaceComponents(replacements)); |
73 } | 73 } |
74 | 74 |
75 void RunTestViaHTTP(const std::string& test_case) { | 75 void RunTestViaHTTP(const std::string& test_case) { |
76 const wchar_t kDocRoot[] = L"third_party/ppapi/tests"; | 76 const wchar_t kDocRoot[] = L"third_party/ppapi/tests"; |
77 scoped_refptr<HTTPTestServer> server = | 77 scoped_refptr<HTTPTestServer> server( |
78 HTTPTestServer::CreateForkingServer(kDocRoot); | 78 HTTPTestServer::CreateServer(kDocRoot)); |
79 ASSERT_TRUE(server); | 79 ASSERT_TRUE(server); |
80 RunTestURL(server->TestServerPage("files/test_case.html?" + test_case)); | 80 RunTestURL(server->TestServerPage("files/test_case.html?" + test_case)); |
81 } | 81 } |
82 | 82 |
83 private: | 83 private: |
84 void RunTestURL(const GURL& test_url) { | 84 void RunTestURL(const GURL& test_url) { |
85 scoped_refptr<TabProxy> tab(GetActiveTab()); | 85 scoped_refptr<TabProxy> tab(GetActiveTab()); |
86 ASSERT_TRUE(tab.get()); | 86 ASSERT_TRUE(tab.get()); |
87 ASSERT_TRUE(tab->NavigateToURL(test_url)); | 87 ASSERT_TRUE(tab->NavigateToURL(test_url)); |
88 std::string escaped_value = | 88 std::string escaped_value = |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 | 124 |
125 // http://crbug.com/48544 | 125 // http://crbug.com/48544 |
126 #if defined(OS_LINUX) | 126 #if defined(OS_LINUX) |
127 // TODO(jabdelmalek) this fails on Linux for unknown reasons. | 127 // TODO(jabdelmalek) this fails on Linux for unknown reasons. |
128 TEST_F(PPAPITest, FAILS_Scrollbar) { | 128 TEST_F(PPAPITest, FAILS_Scrollbar) { |
129 #else | 129 #else |
130 TEST_F(PPAPITest, Scrollbar) { | 130 TEST_F(PPAPITest, Scrollbar) { |
131 #endif | 131 #endif |
132 RunTest("Scrollbar"); | 132 RunTest("Scrollbar"); |
133 } | 133 } |
OLD | NEW |