Various fixes to make ppapi_unittests pass again.

ppapi/proxy/ppapi_proxy_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/proxy/ppapi_proxy_test.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop_proxy.h"
 #include "base/observer_list.h"
@@ skipping 75 matching lines @@
                                    shutdown_event, false);
   harness_set_up->Signal();
 }
 
 void TearDownRemoteHarness(ProxyTestHarnessBase* harness,
                            base::WaitableEvent* harness_torn_down) {
   harness->TearDownHarness();
   harness_torn_down->Signal();
 }
 
+void RunTaskOnRemoteHarness(const base::Closure& task,
+                            base::WaitableEvent* task_complete) {
+ task.Run();
+ task_complete->Signal();
+}
+
 }  // namespace
 
 // ProxyTestHarnessBase --------------------------------------------------------
 
 ProxyTestHarnessBase::ProxyTestHarnessBase() : pp_module_(0x98765),
                                                pp_instance_(0x12345) {
   get_interface_handlers_.AddObserver(this);
 }
 
 ProxyTestHarnessBase::~ProxyTestHarnessBase() {
@@ skipping 27 matching lines @@
   TupleTypes<PpapiMsg_SupportsInterface::ReplyParam>::ValueTuple reply_data;
   EXPECT_TRUE(PpapiMsg_SupportsInterface::ReadReplyParam(
       reply_msg, &reply_data));
 
   sink().ClearMessages();
   return reply_data.a;
 }
 
 // PluginProxyTestHarness ------------------------------------------------------
 
-PluginProxyTestHarness::PluginProxyTestHarness()
-    : plugin_globals_(PpapiGlobals::ForTest()) {
+PluginProxyTestHarness::PluginProxyTestHarness() {
 }
 
 PluginProxyTestHarness::~PluginProxyTestHarness() {
 }
 
+PpapiGlobals* PluginProxyTestHarness::GetGlobals() {
+  if (!plugin_globals_.get())
+    plugin_globals_.reset(new PluginGlobals(PpapiGlobals::ForTest()));
+  return plugin_globals_.get();

[dmichael (off chromium), 2012/09/17 15:27:29]

What about explicitly setting it in SetUpHarness and SetUpHarnessWithChannel?
Those run on the correct thread. That will make it more certain that we do it in
the right place, I think.

[raymes, 2012/09/18 21:29:15]

Done.

+}
+
 Dispatcher* PluginProxyTestHarness::GetDispatcher() {
   return plugin_dispatcher_.get();
 }
 
 void PluginProxyTestHarness::SetUpHarness() {
   // These must be first since the dispatcher set-up uses them.
   PpapiGlobals::SetPpapiGlobalsOnThreadForTest(GetGlobals());
   resource_tracker().DidCreateInstance(pp_instance());
 
   plugin_dispatcher_.reset(new PluginDispatcher(
       &MockGetInterface,
       false));
   plugin_dispatcher_->InitWithTestSink(&sink());
   plugin_dispatcher_->DidCreateInstance(pp_instance());
+  // The plugin proxy delegate is needed for
+  // |PluginPepperDelegate::GetBrowserSender| which is used

[dmichael (off chromium), 2012/09/17 15:27:29]

PluginProxyDelegate

[raymes, 2012/09/18 21:29:15]

Done.

+  // in |ResourceCreationProxy::GetConnection| to get the channel to the
+  // browser. In this case we just use the |plugin_dispatcher_| as the channel
+  // for test purposes.
+  plugin_delegate_mock_.set_browser_sender(plugin_dispatcher_.get());
+  PluginGlobals::Get()->set_plugin_proxy_delegate(&plugin_delegate_mock_);
 }
 
 void PluginProxyTestHarness::SetUpHarnessWithChannel(
     const IPC::ChannelHandle& channel_handle,
     base::MessageLoopProxy* ipc_message_loop,
     base::WaitableEvent* shutdown_event,
     bool is_client) {
   // These must be first since the dispatcher set-up uses them.
   PpapiGlobals::SetPpapiGlobalsOnThreadForTest(GetGlobals());
   resource_tracker().DidCreateInstance(pp_instance());
   plugin_delegate_mock_.Init(ipc_message_loop, shutdown_event);
 
   plugin_dispatcher_.reset(new PluginDispatcher(
       &MockGetInterface,
       false));
   plugin_dispatcher_->InitPluginWithChannel(&plugin_delegate_mock_,
                                             channel_handle,
                                             is_client);
   plugin_dispatcher_->DidCreateInstance(pp_instance());
 }
 
 void PluginProxyTestHarness::TearDownHarness() {
   plugin_dispatcher_->DidDestroyInstance(pp_instance());
   plugin_dispatcher_.reset();
 
   resource_tracker().DidDeleteInstance(pp_instance());
+  plugin_globals_.reset();
 }
 
 base::MessageLoopProxy*
 PluginProxyTestHarness::PluginDelegateMock::GetIPCMessageLoop() {
   return ipc_message_loop_;
 }
 
 base::WaitableEvent*
 PluginProxyTestHarness::PluginDelegateMock::GetShutdownEvent() {
   return shutdown_event_;
@@ skipping 23 matching lines @@
     uint32 plugin_dispatcher_id) {
 }
 
 bool PluginProxyTestHarness::PluginDelegateMock::SendToBrowser(
     IPC::Message* msg) {
   NOTREACHED();
   return false;
 }
 
 IPC::Sender* PluginProxyTestHarness::PluginDelegateMock::GetBrowserSender() {
-  NOTREACHED();
-  return NULL;
+  return browser_sender_;
 }
 
 std::string PluginProxyTestHarness::PluginDelegateMock::GetUILanguage() {
   return std::string("en-US");
 }
 
 void PluginProxyTestHarness::PluginDelegateMock::PreCacheFont(
     const void* logfontw) {
 }
 
@@ skipping 20 matching lines @@
 // HostProxyTestHarness --------------------------------------------------------
 
 class HostProxyTestHarness::MockSyncMessageStatusReceiver
     : public HostDispatcher::SyncMessageStatusReceiver {
  public:
   virtual void BeginBlockOnSyncMessage() OVERRIDE {}
   virtual void EndBlockOnSyncMessage() OVERRIDE {}
 };
 
 HostProxyTestHarness::HostProxyTestHarness()
-    : host_globals_(PpapiGlobals::ForTest()),
-      status_receiver_(new MockSyncMessageStatusReceiver) {
+    : status_receiver_(new MockSyncMessageStatusReceiver) {
 }
 
 HostProxyTestHarness::~HostProxyTestHarness() {
 }
 
+PpapiGlobals* HostProxyTestHarness::GetGlobals() {
+  if (!host_globals_.get())
+    host_globals_.reset(new ppapi::TestGlobals(PpapiGlobals::ForTest()));
+  return host_globals_.get();
+}
+
 Dispatcher* HostProxyTestHarness::GetDispatcher() {
   return host_dispatcher_.get();
 }
 
 void HostProxyTestHarness::SetUpHarness() {
   // These must be first since the dispatcher set-up uses them.
   PpapiGlobals::SetPpapiGlobalsOnThreadForTest(GetGlobals());
   host_dispatcher_.reset(new HostDispatcher(
       pp_module(),
       &MockGetInterface,
@@ skipping 17 matching lines @@
       status_receiver_.release()));
   ppapi::Preferences preferences;
   host_dispatcher_->InitHostWithChannel(&delegate_mock_, channel_handle,
                                         is_client, preferences);
   HostDispatcher::SetForInstance(pp_instance(), host_dispatcher_.get());
 }
 
 void HostProxyTestHarness::TearDownHarness() {
   HostDispatcher::RemoveForInstance(pp_instance());
   host_dispatcher_.reset();
+  host_globals_.reset();
 }
 
 base::MessageLoopProxy*
 HostProxyTestHarness::DelegateMock::GetIPCMessageLoop() {
   return ipc_message_loop_;
 }
 
 base::WaitableEvent* HostProxyTestHarness::DelegateMock::GetShutdownEvent() {
   return shutdown_event_;
 }
@@ skipping 79 matching lines @@
       base::Bind(&TearDownRemoteHarness,
                  remote_harness_,
                  &remote_harness_torn_down));
   remote_harness_torn_down.Wait();
 
   local_harness_->TearDownHarness();
 
   io_thread_.Stop();
 }
 
+void TwoWayTest::PostTaskOnRemoteHarness(const base::Closure& task) {
+  base::WaitableEvent task_complete(true, false);
+  plugin_thread_.message_loop_proxy()->PostTask(FROM_HERE,
+      base::Bind(&RunTaskOnRemoteHarness,
+                 task,
+                 &task_complete));
+  task_complete.Wait();
+}
+
+
 }  // namespace proxy
 }  // namespace ppapi