Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

Unified Diff: ppapi/tests/test_utils.cc

Issue 11364188: PPAPI: Take PPB_MessageLoop out of Dev (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/tests/test_utils.h ('k') | ppapi/utility/threading/simple_thread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/tests/test_utils.cc
diff --git a/ppapi/tests/test_utils.cc b/ppapi/tests/test_utils.cc
index 20a8a81e2f92f49991928ca9d15b71d42728e4cc..e28afda814fe0a529095379d9d2644610f6ea474 100644
--- a/ppapi/tests/test_utils.cc
+++ b/ppapi/tests/test_utils.cc
@@ -13,7 +13,6 @@
#endif
#include "ppapi/c/pp_errors.h"
-#include "ppapi/cpp/dev/message_loop_dev.h"
#include "ppapi/cpp/module.h"
#include "ppapi/cpp/var.h"
@@ -201,7 +200,7 @@ pp::CompletionCallback TestCompletionCallback::GetCallback() {
return pp::CompletionCallback();
else if (callback_type_ == PP_OPTIONAL)
flags = PP_COMPLETIONCALLBACK_FLAG_OPTIONAL;
- target_loop_ = pp::MessageLoop_Dev::GetCurrent();
+ target_loop_ = pp::MessageLoop::GetCurrent();
return pp::CompletionCallback(&TestCompletionCallback::Handler,
const_cast<TestCompletionCallback*>(this),
flags);
@@ -233,7 +232,7 @@ void TestCompletionCallback::Handler(void* user_data, int32_t result) {
callback->post_quit_task_ = false;
callback->QuitMessageLoop();
}
- if (callback->target_loop_ != pp::MessageLoop_Dev::GetCurrent()) {
+ if (callback->target_loop_ != pp::MessageLoop::GetCurrent()) {
// Note, in-process, loop_ and GetCurrent() will both be NULL, so should
// still be equal.
callback->errors_.assign(
@@ -244,20 +243,20 @@ void TestCompletionCallback::Handler(void* user_data, int32_t result) {
}
void TestCompletionCallback::RunMessageLoop() {
- pp::MessageLoop_Dev loop(pp::MessageLoop_Dev::GetCurrent());
+ pp::MessageLoop loop(pp::MessageLoop::GetCurrent());
// If we don't have a message loop, we're probably running in process, where
// PPB_MessageLoop is not supported. Just use the Testing message loop.
- if (loop.is_null() || loop == pp::MessageLoop_Dev::GetForMainThread())
+ if (loop.is_null() || loop == pp::MessageLoop::GetForMainThread())
GetTestingInterface()->RunMessageLoop(instance_);
else
loop.Run();
}
void TestCompletionCallback::QuitMessageLoop() {
- pp::MessageLoop_Dev loop(pp::MessageLoop_Dev::GetCurrent());
+ pp::MessageLoop loop(pp::MessageLoop::GetCurrent());
// If we don't have a message loop, we're probably running in process, where
// PPB_MessageLoop is not supported. Just use the Testing message loop.
- if (loop.is_null() || loop == pp::MessageLoop_Dev::GetForMainThread()) {
+ if (loop.is_null() || loop == pp::MessageLoop::GetForMainThread()) {
GetTestingInterface()->QuitMessageLoop(instance_);
} else {
const bool should_quit = false;
« no previous file with comments | « ppapi/tests/test_utils.h ('k') | ppapi/utility/threading/simple_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698