| 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 "chrome/test/ppapi/ppapi_test.h" | 5 #include "chrome/test/ppapi/ppapi_test.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 } | 270 } |
| 271 #endif | 271 #endif |
| 272 | 272 |
| 273 // See comment above TestingInstance in ppapi/test/testing_instance.h. | 273 // See comment above TestingInstance in ppapi/test/testing_instance.h. |
| 274 // Basically it sends messages using the DOM automation controller. The | 274 // Basically it sends messages using the DOM automation controller. The |
| 275 // value of "..." means it's still working and we should continue to wait, | 275 // value of "..." means it's still working and we should continue to wait, |
| 276 // any other value indicates completion (in this case it will start with | 276 // any other value indicates completion (in this case it will start with |
| 277 // "PASS" or "FAIL"). This keeps us from timing out on waits for long tests. | 277 // "PASS" or "FAIL"). This keeps us from timing out on waits for long tests. |
| 278 PPAPITestMessageHandler handler; | 278 PPAPITestMessageHandler handler; |
| 279 JavascriptTestObserver observer( | 279 JavascriptTestObserver observer( |
| 280 browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(), | 280 browser()->tab_strip_model()->GetActiveWebContents(), |
| 281 &handler); | 281 &handler); |
| 282 | 282 |
| 283 ui_test_utils::NavigateToURL(browser(), test_url); | 283 ui_test_utils::NavigateToURL(browser(), test_url); |
| 284 | 284 |
| 285 ASSERT_TRUE(observer.Run()) << handler.error_message(); | 285 ASSERT_TRUE(observer.Run()) << handler.error_message(); |
| 286 EXPECT_STREQ("PASS", handler.message().c_str()); | 286 EXPECT_STREQ("PASS", handler.message().c_str()); |
| 287 } | 287 } |
| 288 | 288 |
| 289 GURL PPAPITestBase::GetTestURL( | 289 GURL PPAPITestBase::GetTestURL( |
| 290 const net::SpawnedTestServer& http_server, | 290 const net::SpawnedTestServer& http_server, |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 413 const std::string& base, | 413 const std::string& base, |
| 414 const std::string& test_case) { | 414 const std::string& test_case) { |
| 415 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), | 415 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), |
| 416 test_case.c_str()); | 416 test_case.c_str()); |
| 417 } | 417 } |
| 418 | 418 |
| 419 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { | 419 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { |
| 420 // The default content setting for the PPAPI broker is ASK. We purposefully | 420 // The default content setting for the PPAPI broker is ASK. We purposefully |
| 421 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. | 421 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. |
| 422 } | 422 } |
| OLD | NEW |