Chromium Code Reviews| 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 42 const char library_name[] = "libppapi_tests.so"; | 42 const char library_name[] = "libppapi_tests.so"; |
| 43 #endif | 43 #endif |
| 44 | 44 |
| 45 } // namespace | 45 } // namespace |
| 46 | 46 |
| 47 PPAPITestMessageHandler::PPAPITestMessageHandler() { | 47 PPAPITestMessageHandler::PPAPITestMessageHandler() { |
| 48 } | 48 } |
| 49 | 49 |
| 50 TestMessageHandler::MessageResponse PPAPITestMessageHandler::HandleMessage( | 50 TestMessageHandler::MessageResponse PPAPITestMessageHandler::HandleMessage( |
| 51 const std::string& json) { | 51 const std::string& json) { |
| 52 std::string trimmed; | 52 std::string trimmed; |
| 53 TrimString(json, "\"", &trimmed); | 53 base::TrimString(json, "\"", &trimmed); |
| 54 if (trimmed == "...") { | 54 if (trimmed == "...") { |
| 55 return CONTINUE; | 55 return CONTINUE; |
| 56 } else { | 56 } else { |
|
viettrungluu
2013/12/03 21:13:44
If you're going to do a drive-by reindentation, yo
| |
| 57 message_ = trimmed; | 57 message_ = trimmed; |
| 58 return DONE; | 58 return DONE; |
| 59 } | 59 } |
| 60 } | 60 } |
| 61 | 61 |
| 62 void PPAPITestMessageHandler::Reset() { | 62 void PPAPITestMessageHandler::Reset() { |
| 63 TestMessageHandler::Reset(); | 63 TestMessageHandler::Reset(); |
| 64 message_.clear(); | 64 message_.clear(); |
| 65 } | 65 } |
| 66 | 66 |
| 67 PPAPITestBase::InfoBarObserver::InfoBarObserver(PPAPITestBase* test_base) | 67 PPAPITestBase::InfoBarObserver::InfoBarObserver(PPAPITestBase* test_base) |
| 68 : test_base_(test_base), | 68 : test_base_(test_base), |
| 69 expecting_infobar_(false), | 69 expecting_infobar_(false), |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 382 const std::string& base, | 382 const std::string& base, |
| 383 const std::string& test_case) { | 383 const std::string& test_case) { |
| 384 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), | 384 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), |
| 385 test_case.c_str()); | 385 test_case.c_str()); |
| 386 } | 386 } |
| 387 | 387 |
| 388 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { | 388 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { |
| 389 // The default content setting for the PPAPI broker is ASK. We purposefully | 389 // The default content setting for the PPAPI broker is ASK. We purposefully |
| 390 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. | 390 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. |
| 391 } | 391 } |
| OLD | NEW |