Fix two bugs in proxying of Broker Connect callback and shutdown Broker when renderer exits.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/6882020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82017 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 3 insertions, 3 deletions

diff --git a/content/common/child_process_info.cc b/content/common/child_process_info.cc
index 5ffe92c..109a4f4 100644
--- a/content/common/child_process_info.cc
+++ b/content/common/child_process_info.cc
@@ -77,7 +77,7 @@ std::string ChildProcessInfo::GetTypeNameInEnglish(
     case PPAPI_PLUGIN_PROCESS:
       return "Pepper Plugin";
     case PPAPI_BROKER_PROCESS:
-      return "Pepper Broker";
+      return "Pepper Plugin Broker";
     case UNKNOWN_PROCESS:
     default:
       DCHECK(false) << "Unknown child process type!";
diff --git a/content/ppapi_plugin/broker_process_dispatcher.cc b/content/ppapi_plugin/broker_process_dispatcher.cc
index 68e56e7..b9be826 100644
--- a/content/ppapi_plugin/broker_process_dispatcher.cc
+++ b/content/ppapi_plugin/broker_process_dispatcher.cc
@@ -23,7 +23,7 @@ const int kPluginReleaseTimeMs = 30 * 1000;  // 30 seconds.
 BrokerProcessDispatcher::BrokerProcessDispatcher(
     base::ProcessHandle remote_process_handle,
     PP_ConnectInstance_Func connect_instance)
-    : pp::proxy::BrokerDispatcher(remote_process_handle, connect_instance) {
+    : pp::proxy::BrokerSideDispatcher(remote_process_handle, connect_instance) {
   ChildProcess::current()->AddRefProcess();
 }
 
diff --git a/content/ppapi_plugin/broker_process_dispatcher.h b/content/ppapi_plugin/broker_process_dispatcher.h
index e5086fd..c8e1ad3 100644
--- a/content/ppapi_plugin/broker_process_dispatcher.h
+++ b/content/ppapi_plugin/broker_process_dispatcher.h
@@ -11,7 +11,7 @@
 // Wrapper around a BrokerDispatcher that provides the necessary integration
 // for plugin process management. This class is to avoid direct dependencies
 // from the PPAPI proxy on the Chrome multiprocess infrastructure.
-class BrokerProcessDispatcher : public pp::proxy::BrokerDispatcher {
+class BrokerProcessDispatcher : public pp::proxy::BrokerSideDispatcher {
  public:
   BrokerProcessDispatcher(base::ProcessHandle remote_process_handle,
                           PP_ConnectInstance_Func connect_instance);