Add browser resource host for Apps v2 APIs in Pepper.

This CL doesn't include the logic of interacting with extension function dispatcher.

BUG=226303
TEST=None

Review URL: https://chromiumcodereview.appspot.com/15039008

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

3 files changed, 32 insertions, 26 deletions

diff --git a/ppapi/thunk/extensions_common_api.h b/ppapi/thunk/extensions_common_api.h
index 7772c5c..5afb73f 100644
--- a/ppapi/thunk/extensions_common_api.h
+++ b/ppapi/thunk/extensions_common_api.h
@@ -21,12 +21,18 @@ class PPAPI_THUNK_EXPORT ExtensionsCommon_API {
  public:
   virtual ~ExtensionsCommon_API() {}
 
-  virtual int32_t Call(const std::string& request_name,
-                       const std::vector<PP_Var>& input_args,
-                       const std::vector<PP_Var*>& output_args,
-                       scoped_refptr<TrackedCallback> callback) = 0;
-  virtual void Post(const std::string& request_name,
-                    const std::vector<PP_Var>& args) = 0;
+  virtual int32_t CallRenderer(const std::string& request_name,
+                               const std::vector<PP_Var>& input_args,
+                               const std::vector<PP_Var*>& output_args,
+                               scoped_refptr<TrackedCallback> callback) = 0;
+  virtual void PostRenderer(const std::string& request_name,
+                            const std::vector<PP_Var>& args) = 0;
+  virtual int32_t CallBrowser(const std::string& request_name,
+                              const std::vector<PP_Var>& input_args,
+                              const std::vector<PP_Var*>& output_args,
+                              scoped_refptr<TrackedCallback> callback) = 0;
+  virtual void PostBrowser(const std::string& request_name,
+                           const std::vector<PP_Var>& args) = 0;
 
   static const SingletonResourceID kSingletonResourceID =
       EXTENSIONS_COMMON_SINGLETON_ID;
diff --git a/ppapi/thunk/ppb_ext_alarms_thunk.cc b/ppapi/thunk/ppb_ext_alarms_thunk.cc
index cd805ae..2fc88d0 100644
--- a/ppapi/thunk/ppb_ext_alarms_thunk.cc
+++ b/ppapi/thunk/ppb_ext_alarms_thunk.cc
@@ -25,7 +25,7 @@ void Create(PP_Instance instance,
   std::vector<PP_Var> args;
   args.push_back(name);
   args.push_back(alarm_info);
-  enter.functions()->Post("alarms.create", args);
+  enter.functions()->PostRenderer("alarms.create", args);
 }
 
 int32_t Get(PP_Instance instance,
@@ -40,7 +40,7 @@ int32_t Get(PP_Instance instance,
   std::vector<PP_Var*> output_args;
   input_args.push_back(name);
   output_args.push_back(alarm);
-  return enter.SetResult(enter.functions()->Call(
+  return enter.SetResult(enter.functions()->CallRenderer(
       "alarms.get", input_args, output_args, enter.callback()));
 }
 
@@ -54,7 +54,7 @@ int32_t GetAll(PP_Instance instance,
   std::vector<PP_Var> input_args;
   std::vector<PP_Var*> output_args;
   output_args.push_back(alarms);
-  return enter.SetResult(enter.functions()->Call(
+  return enter.SetResult(enter.functions()->CallRenderer(
       "alarms.getAll", input_args, output_args, enter.callback()));
 }
 
@@ -65,7 +65,7 @@ void Clear(PP_Instance instance, PP_Var name) {
 
   std::vector<PP_Var> args;
   args.push_back(name);
-  enter.functions()->Post("alarms.clear", args);
+  enter.functions()->PostRenderer("alarms.clear", args);
 }
 
 void ClearAll(PP_Instance instance) {
@@ -74,7 +74,7 @@ void ClearAll(PP_Instance instance) {
     return;
 
   std::vector<PP_Var> args;
-  enter.functions()->Post("alarms.clearAll", args);
+  enter.functions()->PostRenderer("alarms.clearAll", args);
 }
 
 const PPB_Ext_Alarms_Dev_0_1 g_ppb_ext_alarms_dev_0_1_thunk = {
diff --git a/ppapi/thunk/ppb_ext_socket_thunk.cc b/ppapi/thunk/ppb_ext_socket_thunk.cc
index 18ba462..e4134c7 100644
--- a/ppapi/thunk/ppb_ext_socket_thunk.cc
+++ b/ppapi/thunk/ppb_ext_socket_thunk.cc
@@ -32,7 +32,7 @@ int32_t Create(PP_Instance instance,
   input_args.push_back(type);
   input_args.push_back(options);
   output_args.push_back(create_info);
-  return enter.SetResult(enter.functions()->Call(
+  return enter.SetResult(enter.functions()->CallRenderer(
       "socket.create", input_args, output_args, enter.callback()));
 }
 
@@ -43,7 +43,7 @@ void Destroy(PP_Instance instance, PP_Var socket_id) {
 
   std::vector<PP_Var> args;
   args.push_back(socket_id);
-  enter.functions()->Post("socket.destroy", args);
+  enter.functions()->PostRenderer("socket.destroy", args);
 }
 
 int32_t Connect(PP_Instance instance,
@@ -62,7 +62,7 @@ int32_t Connect(PP_Instance instance,
   input_args.push_back(hostname);
   input_args.push_back(port);
   output_args.push_back(result);
-  return enter.SetResult(enter.functions()->Call(
+  return enter.SetResult(enter.functions()->CallRenderer(
       "socket.connect", input_args, output_args, enter.callback()));
 }
 
@@ -82,7 +82,7 @@ int32_t Bind(PP_Instance instance,
   input_args.push_back(address);
   input_args.push_back(port);
   output_args.push_back(result);
-  return enter.SetResult(enter.functions()->Call(
+  return enter.SetResult(enter.functions()->CallRenderer(
       "socket.bind", input_args, output_args, enter.callback()));
 }
 
@@ -93,7 +93,7 @@ void Disconnect(PP_Instance instance, PP_Var socket_id) {
 
   std::vector<PP_Var> args;
   args.push_back(socket_id);
-  enter.functions()->Post("socket.disconnect", args);
+  enter.functions()->PostRenderer("socket.disconnect", args);
 }
 
 int32_t Read(PP_Instance instance,
@@ -110,7 +110,7 @@ int32_t Read(PP_Instance instance,
   input_args.push_back(socket_id);
   input_args.push_back(buffer_size);
   output_args.push_back(read_info);
-  return enter.SetResult(enter.functions()->Call(
+  return enter.SetResult(enter.functions()->CallRenderer(
       "socket.read", input_args, output_args, enter.callback()));
 }
 
@@ -128,7 +128,7 @@ int32_t Write(PP_Instance instance,
   input_args.push_back(socket_id);
   input_args.push_back(data);
   output_args.push_back(write_info);
-  return enter.SetResult(enter.functions()->Call(
+  return enter.SetResult(enter.functions()->CallRenderer(
       "socket.write", input_args, output_args, enter.callback()));
 }
 
@@ -146,7 +146,7 @@ int32_t RecvFrom(PP_Instance instance,
   input_args.push_back(socket_id);
   input_args.push_back(buffer_size);
   output_args.push_back(recv_from_info);
-  return enter.SetResult(enter.functions()->Call(
+  return enter.SetResult(enter.functions()->CallRenderer(
       "socket.recvFrom", input_args, output_args, enter.callback()));
 }
 
@@ -168,7 +168,7 @@ int32_t SendTo(PP_Instance instance,
   input_args.push_back(address);
   input_args.push_back(port);
   output_args.push_back(write_info);
-  return enter.SetResult(enter.functions()->Call(
+  return enter.SetResult(enter.functions()->CallRenderer(
       "socket.sendTo", input_args, output_args, enter.callback()));
 }
 
@@ -190,7 +190,7 @@ int32_t Listen(PP_Instance instance,
   input_args.push_back(port);
   input_args.push_back(backlog);
   output_args.push_back(result);
-  return enter.SetResult(enter.functions()->Call(
+  return enter.SetResult(enter.functions()->CallRenderer(
       "socket.listen", input_args, output_args, enter.callback()));
 }
 
@@ -206,7 +206,7 @@ int32_t Accept(PP_Instance instance,
   std::vector<PP_Var*> output_args;
   input_args.push_back(socket_id);
   output_args.push_back(accept_info);
-  return enter.SetResult(enter.functions()->Call(
+  return enter.SetResult(enter.functions()->CallRenderer(
       "socket.accept", input_args, output_args, enter.callback()));
 }
 
@@ -226,7 +226,7 @@ int32_t SetKeepAlive(PP_Instance instance,
   input_args.push_back(enable);
   input_args.push_back(delay);
   output_args.push_back(result);
-  return enter.SetResult(enter.functions()->Call(
+  return enter.SetResult(enter.functions()->CallRenderer(
       "socket.setKeepAlive", input_args, output_args, enter.callback()));
 }
 
@@ -244,7 +244,7 @@ int32_t SetNoDelay(PP_Instance instance,
   input_args.push_back(socket_id);
   input_args.push_back(no_delay);
   output_args.push_back(result);
-  return enter.SetResult(enter.functions()->Call(
+  return enter.SetResult(enter.functions()->CallRenderer(
       "socket.setNoDelay", input_args, output_args, enter.callback()));
 }
 
@@ -260,7 +260,7 @@ int32_t GetInfo(PP_Instance instance,
   std::vector<PP_Var*> output_args;
   input_args.push_back(socket_id);
   output_args.push_back(result);
-  return enter.SetResult(enter.functions()->Call(
+  return enter.SetResult(enter.functions()->CallRenderer(
       "socket.getInfo", input_args, output_args, enter.callback()));
 }
 
@@ -274,7 +274,7 @@ int32_t GetNetworkList(PP_Instance instance,
   std::vector<PP_Var> input_args;
   std::vector<PP_Var*> output_args;
   output_args.push_back(result);
-  return enter.SetResult(enter.functions()->Call(
+  return enter.SetResult(enter.functions()->CallRenderer(
       "socket.getNetworkList", input_args, output_args, enter.callback()));
 }