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

Unified Diff: ppapi/proxy/ppapi_proxy_test.h

Issue 10544089: Implement the file chooser as a new resource "host" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months 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
Index: ppapi/proxy/ppapi_proxy_test.h
diff --git a/ppapi/proxy/ppapi_proxy_test.h b/ppapi/proxy/ppapi_proxy_test.h
index b4ad1b5136e349bfab4eaf5cea8ef9ecf7e002b0..782b8c4300027e39237f068fe974964f78d1f1d4 100644
--- a/ppapi/proxy/ppapi_proxy_test.h
+++ b/ppapi/proxy/ppapi_proxy_test.h
@@ -9,7 +9,6 @@
#include "base/memory/scoped_ptr.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread.h"
-#include "ipc/ipc_test_sink.h"
#include "ppapi/c/pp_instance.h"
#include "ppapi/proxy/host_dispatcher.h"
#include "ppapi/proxy/plugin_dispatcher.h"
@@ -17,6 +16,7 @@
#include "ppapi/proxy/plugin_proxy_delegate.h"
#include "ppapi/proxy/plugin_resource_tracker.h"
#include "ppapi/proxy/plugin_var_tracker.h"
+#include "ppapi/proxy/resource_message_test_sink.h"
#include "ppapi/shared_impl/test_globals.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -32,7 +32,7 @@ class ProxyTestHarnessBase {
PP_Module pp_module() const { return pp_module_; }
PP_Instance pp_instance() const { return pp_instance_; }
- IPC::TestSink& sink() { return sink_; }
+ ResourceMessageTestSink& sink() { return sink_; }
virtual PpapiGlobals* GetGlobals() = 0;
// Returns either the plugin or host dispatcher, depending on the test.
@@ -65,7 +65,7 @@ class ProxyTestHarnessBase {
private:
// Destination for IPC messages sent by the test.
- IPC::TestSink sink_;
+ ResourceMessageTestSink sink_;
// The module and instance ID associated with the plugin dispatcher.
PP_Module pp_module_;
@@ -271,5 +271,16 @@ class TwoWayTest : public testing::Test {
base::WaitableEvent shutdown_event_;
};
+// Used during Gtests when you have a PP_Var that you want to EXPECT is equal
+// to a certain constant string value:
+//
+// EXPECT_VAR_IS_STRING("foo", my_var);
+#define EXPECT_VAR_IS_STRING(str, var) { \
+ StringVar* sv = StringVar::FromPPVar(var); \
+ EXPECT_TRUE(sv); \
+ if (sv) \
+ EXPECT_EQ(str, sv->value()); \
+}
+
} // namespace proxy
} // namespace ppapi

Powered by Google App Engine
This is Rietveld 408576698