Update graphics3d proxy

BUG= none
TEST= ppb_graphics3d
Review URL: http://codereview.chromium.org/7828054

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

15 files changed, 203 insertions, 26 deletions

diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_graphics_3d_rpc_server.cc b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_graphics_3d_rpc_server.cc
index 26e6adc..9b9f161 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_graphics_3d_rpc_server.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_graphics_3d_rpc_server.cc
@@ -88,6 +88,24 @@ bool IsGpuBlacklisted() {
 //@{
 /// The following methods are SRPC dispatchers for ppapi/c/ppb_graphics_3d.h.
 
+void PpbGraphics3DRpcServer::PPB_Graphics3D_GetAttribMaxValue(
+    NaClSrpcRpc* rpc,
+    NaClSrpcClosure* done,
+    PP_Instance instance_id,
+    int32_t attrib,
+    int32_t* attrib_value,
+    int32_t* pp_error) {
+  DebugPrintf(
+      "PpbGraphics3DRpcServer::PPB_Graphics3D_GetAttribMaxValue(...)\n");
+  NaClSrpcClosureRunner runner(done);
+  rpc->result = NACL_SRPC_RESULT_APP_ERROR;
+  *pp_error = ppapi_proxy::PPBGraphics3DInterface()->GetAttribMaxValue(
+      instance_id, attrib, attrib_value);
+  DebugPrintf("    PPB_Graphics3D_GetAttribMaxValue: pp_error=%"NACL_PRId32"\n",
+              *pp_error);
+  rpc->result = NACL_SRPC_RESULT_OK;
+}
+
 void PpbGraphics3DRpcServer::PPB_Graphics3D_Create(
     NaClSrpcRpc* rpc,
     NaClSrpcClosure* done,
@@ -104,6 +122,8 @@ void PpbGraphics3DRpcServer::PPB_Graphics3D_Create(
     return;
   *graphics3d_id = ppapi_proxy::PPBGraphics3DInterface()->Create(
       instance, share_context, attrib_list);
+  DebugPrintf("    PPB_Graphics3D_Create: resource=%"NACL_PRId32"\n",
+              *graphics3d_id);
   rpc->result = NACL_SRPC_RESULT_OK;
 }
 
@@ -114,7 +134,7 @@ void PpbGraphics3DRpcServer::PPB_Graphics3D_GetAttribs(
     nacl_abi_size_t in_attrib_list_count, int32_t* in_attrib_list,
     nacl_abi_size_t* out_attrib_list_count, int32_t* out_attrib_list,
     int32_t* pp_error) {
-  DebugPrintf("PpbGraphics3DRpcServer::PPB_Graphics3D_GetAttrib(...)\n");
+  DebugPrintf("PpbGraphics3DRpcServer::PPB_Graphics3D_GetAttribs(...)\n");
   NaClSrpcClosureRunner runner(done);
   rpc->result = NACL_SRPC_RESULT_APP_ERROR;
   if (in_attrib_list_count == 0)
@@ -126,6 +146,8 @@ void PpbGraphics3DRpcServer::PPB_Graphics3D_GetAttribs(
     return;
   *pp_error = ppapi_proxy::PPBGraphics3DInterface()->GetAttribs(
       graphics3d_id, out_attrib_list);
+  DebugPrintf("    PPB_Graphics3D_GetAttrib: pp_error=%"NACL_PRId32"\n",
+              *pp_error);
   rpc->result = NACL_SRPC_RESULT_OK;
 }
 
@@ -135,7 +157,7 @@ void PpbGraphics3DRpcServer::PPB_Graphics3D_SetAttribs(
     PP_Resource graphics3d_id,
     nacl_abi_size_t attrib_list_count, int32_t* attrib_list,
     int32_t* pp_error) {
-  DebugPrintf("PpbGraphics3DRpcServer::PPB_Graphics3D_SetAttrib(...)\n");
+  DebugPrintf("PpbGraphics3DRpcServer::PPB_Graphics3D_SetAttribs(...)\n");
   NaClSrpcClosureRunner runner(done);
   rpc->result = NACL_SRPC_RESULT_APP_ERROR;
   if (attrib_list_count == 0)
@@ -144,6 +166,22 @@ void PpbGraphics3DRpcServer::PPB_Graphics3D_SetAttribs(
     return;
   *pp_error = ppapi_proxy::PPBGraphics3DInterface()->SetAttribs(
       graphics3d_id, attrib_list);
+  DebugPrintf("    PPB_Graphics3D_SetAttrib: pp_error=%"NACL_PRId32"\n",
+              *pp_error);
+  rpc->result = NACL_SRPC_RESULT_OK;
+}
+
+void PpbGraphics3DRpcServer::PPB_Graphics3D_GetError(
+    NaClSrpcRpc* rpc,
+    NaClSrpcClosure* done,
+    PP_Resource graphics3d_id,
+    int32_t* pp_error) {
+  DebugPrintf("PpbGraphics3DRpcServer::PPB_Graphics3D_GetError(...)\n");
+  NaClSrpcClosureRunner runner(done);
+  rpc->result = NACL_SRPC_RESULT_APP_ERROR;
+  *pp_error = ppapi_proxy::PPBGraphics3DInterface()->GetError(graphics3d_id);
+  DebugPrintf("    PPB_Graphics3D_GetError: pp_error=%"NACL_PRId32"\n",
+              *pp_error);
   rpc->result = NACL_SRPC_RESULT_OK;
 }
 
@@ -197,6 +235,8 @@ void PpbGraphics3DRpcServer::PPB_Graphics3DTrusted_CreateRaw(
     *resource_id = ppapi_proxy::PPBGraphics3DTrustedInterface()->CreateRaw(
         instance, share_context, attrib_list);
   }
+  DebugPrintf("    PPB_Graphics3DTrusted_CreateRaw: resource=%"NACL_PRId32"\n",
+              *resource_id);
   rpc->result = NACL_SRPC_RESULT_OK;
 }
 
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.cc b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.cc
index d6b15d9..3befbf5 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_graphics_3d.cc
@@ -41,11 +41,23 @@ int32_t GetNumAttribs(const int32_t* attrib_list) {
   return num;
 }
 
-int32_t GetAttribMaxValue(PP_Resource instance,
-                          int32_t attribute,
-                          int32_t* value) {
-  // TODO(nfullagar): Implement me.
-  return PP_ERROR_FAILED;
+int32_t GetAttribMaxValue(PP_Instance instance,
+                          int32_t attrib,
+                          int32_t* attrib_value) {
+  DebugPrintf("PPB_Graphics3D::GetAttribMaxValue: instance=%"NACL_PRIu32"\n",
+              instance);
+  int32_t pp_error;
+  NaClSrpcError retval =
+      PpbGraphics3DRpcClient::PPB_Graphics3D_GetAttribMaxValue(
+          GetMainSrpcChannel(),
+          instance,
+          attrib,
+          attrib_value,
+          &pp_error);
+  if (retval != NACL_SRPC_RESULT_OK) {
+    return PP_ERROR_BADARGUMENT;
+  }
+  return pp_error;
 }
 
 PP_Resource Create(PP_Instance instance,
@@ -112,9 +124,21 @@ int32_t SetAttribs(PP_Resource graphics3d_id,
   return pp_error;
 }
 
-int32_t GetError(PP_Resource graphics_3d) {
-  // TODO(nfullagar): Implement me.
-  return PP_ERROR_FAILED;
+int32_t GetError(PP_Resource graphics3d_id) {
+  DebugPrintf("PPB_Graphics3D::GetError: graphics3d_id=%"NACL_PRIu32"\n",
+              graphics3d_id);
+  int32_t pp_error;
+  NaClSrpcError retval =
+      PpbGraphics3DRpcClient::PPB_Graphics3D_GetError(
+          GetMainSrpcChannel(),
+          graphics3d_id,
+          &pp_error);
+  if (retval != NACL_SRPC_RESULT_OK) {
+    DebugPrintf("PPB_Graphics3D::GetError: retval != NACL_SRPC_RESULT_OK\n");
+    return PP_ERROR_BADARGUMENT;
+  }
+  DebugPrintf("PPB_Graphics3D::GetError: pp_error=%"NACL_PRIu32"\n", pp_error);
+  return pp_error;
 }
 
 int32_t ResizeBuffers(PP_Resource graphics3d_id,
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppb_graphics_3d.srpc b/ppapi/native_client/src/shared/ppapi_proxy/ppb_graphics_3d.srpc
index 0f801f7..11ebc83 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/ppb_graphics_3d.srpc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/ppb_graphics_3d.srpc
@@ -13,6 +13,15 @@
 {
  'name': 'PpbGraphics3DRpc',
  'rpcs': [
+          # For PPB_Graphics3D.GetAttribMaxValue(...)
+          {'name': 'PPB_Graphics3D_GetAttribMaxValue',
+           'inputs': [['instance', 'PP_Instance'],
+                      ['attribute', 'int32_t']
+                     ],
+           'outputs': [['value', 'int32_t'],
+                       ['pp_error', 'int32_t']
+                      ],
+          },
           # For PPB_Graphics3D.Create(...)
           {'name': 'PPB_Graphics3D_Create',
            'inputs': [['instance', 'PP_Instance'],
@@ -30,15 +39,22 @@
            'outputs': [['output_attrib_list', 'int32_t[]'],
                        ['pp_error', 'int32_t']
                       ],
-           },
-           # For PPB_Graphics3D.SetAttribs(...)
-           {'name': 'PPB_Graphics3D_SetAttribs',
-            'inputs': [['context', 'PP_Resource'],
-                       ['attrib_list', 'int32_t[]']
+          },
+          # For PPB_Graphics3D.SetAttribs(...)
+          {'name': 'PPB_Graphics3D_SetAttribs',
+           'inputs': [['context', 'PP_Resource'],
+                      ['attrib_list', 'int32_t[]']
+                     ],
+           'outputs': [['pp_error', 'int32_t']
                       ],
-            'outputs': [['pp_error', 'int32_t']
-                       ],
-           },
+          },
+          # For PPB_Graphics3D.GetError(...)
+          {'name': 'PPB_Graphics3D_GetError',
+           'inputs': [['context', 'PP_Resource']
+                     ],
+           'outputs': [['pp_error', 'int32_t']
+                      ],
+          },
           # For PPB_Graphics3D.SwapBuffers(...)
           {'name': 'PPB_Graphics3D_SwapBuffers',
            'inputs': [['context', 'PP_Resource'],
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_client.cc b/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_client.cc
index a4b5ead..00fe720 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_client.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_client.cc
@@ -1310,6 +1310,27 @@ NaClSrpcError PpbGraphics2DRpcClient::PPB_Graphics2D_Flush(
   return retval;
 }
 
+NaClSrpcError PpbGraphics3DRpcClient::PPB_Graphics3D_GetAttribMaxValue(
+    NaClSrpcChannel* channel,
+    PP_Instance instance,
+    int32_t attribute,
+    int32_t* value,
+    int32_t* pp_error)  {
+  VCHECK(ppapi_proxy::PPBCoreInterface()->IsMainThread(),
+         ("%s: PPAPI calls are not supported off the main thread\n",
+          __FUNCTION__));
+  NaClSrpcError retval;
+  retval = NaClSrpcInvokeBySignature(
+      channel,
+      "PPB_Graphics3D_GetAttribMaxValue:ii:ii",
+      instance,
+      attribute,
+      value,
+      pp_error
+  );
+  return retval;
+}
+
 NaClSrpcError PpbGraphics3DRpcClient::PPB_Graphics3D_Create(
     NaClSrpcChannel* channel,
     PP_Instance instance,
@@ -1371,6 +1392,23 @@ NaClSrpcError PpbGraphics3DRpcClient::PPB_Graphics3D_SetAttribs(
   return retval;
 }
 
+NaClSrpcError PpbGraphics3DRpcClient::PPB_Graphics3D_GetError(
+    NaClSrpcChannel* channel,
+    PP_Resource context,
+    int32_t* pp_error)  {
+  VCHECK(ppapi_proxy::PPBCoreInterface()->IsMainThread(),
+         ("%s: PPAPI calls are not supported off the main thread\n",
+          __FUNCTION__));
+  NaClSrpcError retval;
+  retval = NaClSrpcInvokeBySignature(
+      channel,
+      "PPB_Graphics3D_GetError:i:i",
+      context,
+      pp_error
+  );
+  return retval;
+}
+
 NaClSrpcError PpbGraphics3DRpcClient::PPB_Graphics3D_SwapBuffers(
     NaClSrpcChannel* channel,
     PP_Resource context,
@@ -2751,3 +2789,5 @@ NaClSrpcError PpbZoomRpcClient::PPB_Zoom_ZoomLimitsChanged(
   );
   return retval;
 }
+
+
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_server.cc b/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_server.cc
index f1268fa..136fb41 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_server.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_server.cc
@@ -1056,6 +1056,22 @@ static void PPB_Graphics2D_FlushDispatcher(
   );
 }
 
+static void PPB_Graphics3D_GetAttribMaxValueDispatcher(
+    NaClSrpcRpc* rpc,
+    NaClSrpcArg** inputs,
+    NaClSrpcArg** outputs,
+    NaClSrpcClosure* done
+) {
+  PpbGraphics3DRpcServer::PPB_Graphics3D_GetAttribMaxValue(
+      rpc,
+      done,
+      inputs[0]->u.ival,
+      inputs[1]->u.ival,
+      &(outputs[0]->u.ival),
+      &(outputs[1]->u.ival)
+  );
+}
+
 static void PPB_Graphics3D_CreateDispatcher(
     NaClSrpcRpc* rpc,
     NaClSrpcArg** inputs,
@@ -1103,6 +1119,20 @@ static void PPB_Graphics3D_SetAttribsDispatcher(
   );
 }
 
+static void PPB_Graphics3D_GetErrorDispatcher(
+    NaClSrpcRpc* rpc,
+    NaClSrpcArg** inputs,
+    NaClSrpcArg** outputs,
+    NaClSrpcClosure* done
+) {
+  PpbGraphics3DRpcServer::PPB_Graphics3D_GetError(
+      rpc,
+      done,
+      inputs[0]->u.ival,
+      &(outputs[0]->u.ival)
+  );
+}
+
 static void PPB_Graphics3D_SwapBuffersDispatcher(
     NaClSrpcRpc* rpc,
     NaClSrpcArg** inputs,
@@ -2288,9 +2318,11 @@ NaClSrpcHandlerDesc PpbRpcs::srpc_methods[] = {
   { "PPB_Graphics2D_Scroll:iCC:", PPB_Graphics2D_ScrollDispatcher },
   { "PPB_Graphics2D_ReplaceContents:ii:", PPB_Graphics2D_ReplaceContentsDispatcher },
   { "PPB_Graphics2D_Flush:ii:i", PPB_Graphics2D_FlushDispatcher },
+  { "PPB_Graphics3D_GetAttribMaxValue:ii:ii", PPB_Graphics3D_GetAttribMaxValueDispatcher },
   { "PPB_Graphics3D_Create:iiI:i", PPB_Graphics3D_CreateDispatcher },
   { "PPB_Graphics3D_GetAttribs:iI:Ii", PPB_Graphics3D_GetAttribsDispatcher },
   { "PPB_Graphics3D_SetAttribs:iI:i", PPB_Graphics3D_SetAttribsDispatcher },
+  { "PPB_Graphics3D_GetError:i:i", PPB_Graphics3D_GetErrorDispatcher },
   { "PPB_Graphics3D_SwapBuffers:ii:i", PPB_Graphics3D_SwapBuffersDispatcher },
   { "PPB_Graphics3DTrusted_CreateRaw:iiI:i", PPB_Graphics3DTrusted_CreateRawDispatcher },
   { "PPB_Graphics3DTrusted_InitCommandBuffer:ii:i", PPB_Graphics3DTrusted_InitCommandBufferDispatcher },
@@ -2366,3 +2398,4 @@ NaClSrpcHandlerDesc PpbRpcs::srpc_methods[] = {
   { "PPB_Zoom_ZoomLimitsChanged:idd:", PPB_Zoom_ZoomLimitsChangedDispatcher },
   { NULL, NULL }
 };
+
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppp_rpc_client.cc b/ppapi/native_client/src/shared/ppapi_proxy/ppp_rpc_client.cc
index 98ae085..2e7def5 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/ppp_rpc_client.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/ppp_rpc_client.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2011 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.
 //
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppp_rpc_server.cc b/ppapi/native_client/src/shared/ppapi_proxy/ppp_rpc_server.cc
index 325291c..7e53e75 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/ppp_rpc_server.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/ppp_rpc_server.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2011 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.
 //
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/trusted/srpcgen/ppb_rpc.h b/ppapi/native_client/src/shared/ppapi_proxy/trusted/srpcgen/ppb_rpc.h
index 23e33f9c..29b86fd 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/trusted/srpcgen/ppb_rpc.h
+++ b/ppapi/native_client/src/shared/ppapi_proxy/trusted/srpcgen/ppb_rpc.h
@@ -546,6 +546,13 @@ class PpbGraphics2DRpcServer {
 
 class PpbGraphics3DRpcServer {
  public:
+  static void PPB_Graphics3D_GetAttribMaxValue(
+      NaClSrpcRpc* rpc,
+      NaClSrpcClosure* done,
+      PP_Instance instance,
+      int32_t attribute,
+      int32_t* value,
+      int32_t* pp_error);
   static void PPB_Graphics3D_Create(
       NaClSrpcRpc* rpc,
       NaClSrpcClosure* done,
@@ -566,6 +573,11 @@ class PpbGraphics3DRpcServer {
       PP_Resource context,
       nacl_abi_size_t attrib_list_bytes, int32_t* attrib_list,
       int32_t* pp_error);
+  static void PPB_Graphics3D_GetError(
+      NaClSrpcRpc* rpc,
+      NaClSrpcClosure* done,
+      PP_Resource context,
+      int32_t* pp_error);
   static void PPB_Graphics3D_SwapBuffers(
       NaClSrpcRpc* rpc,
       NaClSrpcClosure* done,
@@ -1123,3 +1135,4 @@ class PpbRpcs {
 
 
 #endif  // GEN_PPAPI_PROXY_PPB_RPC_H_
+
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/trusted/srpcgen/ppp_rpc.h b/ppapi/native_client/src/shared/ppapi_proxy/trusted/srpcgen/ppp_rpc.h
index efaa3fe..94c9c3d 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/trusted/srpcgen/ppp_rpc.h
+++ b/ppapi/native_client/src/shared/ppapi_proxy/trusted/srpcgen/ppp_rpc.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2011 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.
 //
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/trusted/srpcgen/upcall.h b/ppapi/native_client/src/shared/ppapi_proxy/trusted/srpcgen/upcall.h
index 617e709..175aead 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/trusted/srpcgen/upcall.h
+++ b/ppapi/native_client/src/shared/ppapi_proxy/trusted/srpcgen/upcall.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2011 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.
 //
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/untrusted/srpcgen/ppb_rpc.h b/ppapi/native_client/src/shared/ppapi_proxy/untrusted/srpcgen/ppb_rpc.h
index 059d8e0..5a5001b 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/untrusted/srpcgen/ppb_rpc.h
+++ b/ppapi/native_client/src/shared/ppapi_proxy/untrusted/srpcgen/ppb_rpc.h
@@ -478,6 +478,12 @@ class PpbGraphics2DRpcClient {
 
 class PpbGraphics3DRpcClient {
  public:
+  static NaClSrpcError PPB_Graphics3D_GetAttribMaxValue(
+      NaClSrpcChannel* channel,
+      PP_Instance instance,
+      int32_t attribute,
+      int32_t* value,
+      int32_t* pp_error);
   static NaClSrpcError PPB_Graphics3D_Create(
       NaClSrpcChannel* channel,
       PP_Instance instance,
@@ -495,6 +501,10 @@ class PpbGraphics3DRpcClient {
       PP_Resource context,
       nacl_abi_size_t attrib_list_bytes, int32_t* attrib_list,
       int32_t* pp_error);
+  static NaClSrpcError PPB_Graphics3D_GetError(
+      NaClSrpcChannel* channel,
+      PP_Resource context,
+      int32_t* pp_error);
   static NaClSrpcError PPB_Graphics3D_SwapBuffers(
       NaClSrpcChannel* channel,
       PP_Resource context,
@@ -976,3 +986,4 @@ class PpbZoomRpcClient {
 
 
 #endif  // GEN_PPAPI_PROXY_PPB_RPC_H_
+
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/untrusted/srpcgen/ppp_rpc.h b/ppapi/native_client/src/shared/ppapi_proxy/untrusted/srpcgen/ppp_rpc.h
index 146d0a2..adee80b 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/untrusted/srpcgen/ppp_rpc.h
+++ b/ppapi/native_client/src/shared/ppapi_proxy/untrusted/srpcgen/ppp_rpc.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2011 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.
 //
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/untrusted/srpcgen/upcall.h b/ppapi/native_client/src/shared/ppapi_proxy/untrusted/srpcgen/upcall.h
index 027b57b..4f05b28 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/untrusted/srpcgen/upcall.h
+++ b/ppapi/native_client/src/shared/ppapi_proxy/untrusted/srpcgen/upcall.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2011 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.
 //
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/upcall_client.cc b/ppapi/native_client/src/shared/ppapi_proxy/upcall_client.cc
index 6b174ff..b7df135 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/upcall_client.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/upcall_client.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2011 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.
 //
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/upcall_server.cc b/ppapi/native_client/src/shared/ppapi_proxy/upcall_server.cc
index bf7ab73..9e5b905 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/upcall_server.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/upcall_server.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2011 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.
 //