Pepper proxy: make the browser sender handle the proxy lock properly.

ppapi/proxy/plugin_globals.h

Index: ppapi/proxy/plugin_globals.h
diff --git a/ppapi/proxy/plugin_globals.h b/ppapi/proxy/plugin_globals.h
index 215ad630a87593bdb153748af6bc4debb8e32a20..181ab22e6e3890f1b0cb0fb5d89d8e31686fa819 100644
--- a/ppapi/proxy/plugin_globals.h
+++ b/ppapi/proxy/plugin_globals.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_PROXY_PLUGIN_GLOBALS_H_
 #define PPAPI_PROXY_PLUGIN_GLOBALS_H_
 
+#include <string>
+
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
@@ -15,6 +17,10 @@
 #include "ppapi/shared_impl/callback_tracker.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 
+namespace IPC {
+class Sender;
+}
+
 namespace ppapi {
 namespace proxy {
 
@@ -58,6 +64,15 @@ class PPAPI_PROXY_EXPORT PluginGlobals : public PpapiGlobals {
                                       const std::string& value) OVERRIDE;
   virtual MessageLoopShared* GetCurrentMessageLoop() OVERRIDE;
 
+  // Returns the channel for sending to the browser.
+  IPC::Sender* GetBrowserSender();
+
+  // Returns the language code of the current UI language.
+  std::string GetUILanguage();
+
+  // Sets the active url which is reported by breakpad.
+  void SetActiveURL(const std::string& url);
+
   // Getters for the plugin-specific versions.
   PluginResourceTracker* plugin_resource_tracker() {
     return &plugin_resource_tracker_;
@@ -67,9 +82,6 @@ class PPAPI_PROXY_EXPORT PluginGlobals : public PpapiGlobals {
   }
 
   // The embedder should call set_proxy_delegate during startup.
-  PluginProxyDelegate* plugin_proxy_delegate() {
-    return plugin_proxy_delegate_;
-  }
   void set_plugin_proxy_delegate(PluginProxyDelegate* d) {
     plugin_proxy_delegate_ = d;
   }
@@ -101,6 +113,8 @@ class PPAPI_PROXY_EXPORT PluginGlobals : public PpapiGlobals {
   void set_command_line(const std::string& c) { command_line_ = c; }
 
  private:
+  class BrowserSender;
+
   // PpapiGlobals overrides.
   virtual bool IsPluginGlobals() const OVERRIDE;
 
@@ -125,6 +139,8 @@ class PPAPI_PROXY_EXPORT PluginGlobals : public PpapiGlobals {
   // called.
   std::string command_line_;
 
+  scoped_ptr<BrowserSender> browser_sender_;
+
   DISALLOW_COPY_AND_ASSIGN(PluginGlobals);
 };