6 files changed, 19 insertions, 21 deletions
diff --git a/ppapi/shared_impl/ppb_char_set_shared.cc b/ppapi/shared_impl/ppb_char_set_shared.cc
index 70ecd39..e8cadab 100644
--- a/ppapi/shared_impl/ppb_char_set_shared.cc
+++ b/ppapi/shared_impl/ppb_char_set_shared.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -103,13 +103,13 @@ char* PPB_CharSet_Shared::UTF16ToCharSet(
 
   // ucnv_fromUChars returns size not including terminating null.
   char* encoded = static_cast<char*>(
-      thunk::GetPPB_Memory_Dev_Thunk()->MemAlloc(encoded_max_length + 1));
+      thunk::GetPPB_Memory_Dev_0_1_Thunk()->MemAlloc(encoded_max_length + 1));
   int actual_size = ucnv_fromUChars(converter, encoded,
       encoded_max_length, reinterpret_cast<const UChar*>(utf16), utf16_len,
       &status);
   ucnv_close(converter);
   if (!U_SUCCESS(status)) {
-    thunk::GetPPB_Memory_Dev_Thunk()->MemFree(encoded);
+    thunk::GetPPB_Memory_Dev_0_1_Thunk()->MemFree(encoded);
     return NULL;
   }
   encoded[actual_size] = 0;
@@ -141,7 +141,7 @@ uint16_t* PPB_CharSet_Shared::CharSetToUTF16(
     return NULL;
 
   uint16_t* ret_buf = static_cast<uint16_t*>(
-      thunk::GetPPB_Memory_Dev_Thunk()->MemAlloc(
+      thunk::GetPPB_Memory_Dev_0_1_Thunk()->MemAlloc(
           (output.size() + 1) * sizeof(uint16_t)));
   if (!ret_buf)
     return NULL;
diff --git a/ppapi/shared_impl/ppb_crypto_shared.cc b/ppapi/shared_impl/ppb_crypto_shared.cc
index 42694d0..02b5051 100644
--- a/ppapi/shared_impl/ppb_crypto_shared.cc
+++ b/ppapi/shared_impl/ppb_crypto_shared.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -27,7 +27,7 @@ const PPB_Crypto_Dev crypto_interface = {
 
 namespace thunk {
 
-PPAPI_THUNK_EXPORT const PPB_Crypto_Dev* GetPPB_Crypto_Dev_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_Crypto_Dev_0_1* GetPPB_Crypto_Dev_0_1_Thunk() {
   return &crypto_interface;
 }
 
diff --git a/ppapi/shared_impl/ppb_memory_shared.cc b/ppapi/shared_impl/ppb_memory_shared.cc
index 2cf8aa7..57d52f0 100644
--- a/ppapi/shared_impl/ppb_memory_shared.cc
+++ b/ppapi/shared_impl/ppb_memory_shared.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -34,7 +34,7 @@ const PPB_Memory_Dev ppb_memory = {
 namespace thunk {
 
 // static
-PPAPI_SHARED_EXPORT const PPB_Memory_Dev* GetPPB_Memory_Dev_Thunk() {
+PPAPI_SHARED_EXPORT const PPB_Memory_Dev_0_1* GetPPB_Memory_Dev_0_1_Thunk() {
   return &ppb_memory;
 }
 
diff --git a/ppapi/shared_impl/ppb_var_shared.cc b/ppapi/shared_impl/ppb_var_shared.cc
index 5549818..7b0ffb4 100644
--- a/ppapi/shared_impl/ppb_var_shared.cc
+++ b/ppapi/shared_impl/ppb_var_shared.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -75,14 +75,14 @@ PP_Var CreateArrayBufferVar(uint32_t size_in_bytes) {
       size_in_bytes);
 }
 
-uint32_t ByteLength(struct PP_Var array) {
+uint32_t ByteLength(PP_Var array) {
   ArrayBufferVar* buffer = ArrayBufferVar::FromPPVar(array);
   if (!buffer)
     return 0;
   return buffer->ByteLength();
 }
 
-void* Map(struct PP_Var array) {
+void* Map(PP_Var array) {
   ArrayBufferVar* buffer = ArrayBufferVar::FromPPVar(array);
   if (!buffer)
     return NULL;
@@ -98,7 +98,7 @@ const PPB_VarArrayBuffer_Dev var_arraybuffer_interface = {
 }  // namespace
 
 // static
-const PPB_Var* PPB_Var_Shared::GetVarInterface() {
+const PPB_Var_1_1* PPB_Var_Shared::GetVarInterface1_1() {
   return &var_interface;
 }
 
@@ -113,4 +113,3 @@ const PPB_VarArrayBuffer_Dev* PPB_Var_Shared::GetVarArrayBufferInterface() {
 }
 
 }  // namespace ppapi
-
diff --git a/ppapi/shared_impl/ppb_var_shared.h b/ppapi/shared_impl/ppb_var_shared.h
index 5865d46..f8b622a 100644
--- a/ppapi/shared_impl/ppb_var_shared.h
+++ b/ppapi/shared_impl/ppb_var_shared.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -7,18 +7,17 @@
 
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/pp_stdint.h"
+#include "ppapi/c/ppb_var.h"
+#include "ppapi/c/dev/ppb_var_array_buffer_dev.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 
 struct PP_Var;
-struct PPB_Var;
-struct PPB_Var_1_0;
-struct PPB_VarArrayBuffer_Dev;
 
 namespace ppapi {
 
 class PPAPI_SHARED_EXPORT PPB_Var_Shared {
  public:
-  static const PPB_Var* GetVarInterface();
+  static const PPB_Var_1_1* GetVarInterface1_1();
   static const PPB_Var_1_0* GetVarInterface1_0();
   static const PPB_VarArrayBuffer_Dev* GetVarArrayBufferInterface();
 };
diff --git a/ppapi/shared_impl/private/net_address_private_impl.cc b/ppapi/shared_impl/private/net_address_private_impl.cc
index 0c43a2f..bf548d1 100644
--- a/ppapi/shared_impl/private/net_address_private_impl.cc
+++ b/ppapi/shared_impl/private/net_address_private_impl.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -281,8 +281,8 @@ const PPB_NetAddress_Private net_address_private_interface = {
 
 namespace thunk {
 
-PPAPI_THUNK_EXPORT const PPB_NetAddress_Private*
-GetPPB_NetAddress_Private_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_NetAddress_Private_0_1*
+GetPPB_NetAddress_Private_0_1_Thunk() {
   return &net_address_private_interface;
 }