Move PPB_VarArray and PPB_VarDictionary out of dev.

ppapi/cpp/extensions/dev/socket_dev.cc

 // Copyright (c) 2013 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.
 
 #include "ppapi/cpp/extensions/dev/socket_dev.h"
 
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/extensions/optional.h"
 #include "ppapi/cpp/extensions/to_var_converter.h"
 #include "ppapi/cpp/logging.h"
@@ skipping 58 matching lines @@
     : socket_id(kSocketId) {
 }
 
 CreateInfo_Dev::~CreateInfo_Dev() {
 }
 
 bool CreateInfo_Dev::Populate(const PP_Ext_Socket_CreateInfo_Dev& value) {
   if (value.type != PP_VARTYPE_DICTIONARY)
     return false;
 
-  VarDictionary_Dev dict(value);
+  VarDictionary dict(value);
   bool result = socket_id.Populate(dict);
 
   return result;
 }
 
 Var CreateInfo_Dev::CreateVar() const {
-  VarDictionary_Dev dict;
+  VarDictionary dict;
 
   bool result = socket_id.AddTo(&dict);
   // Suppress unused variable warnings.
   static_cast<void>(result);
   PP_DCHECK(result);
 
   return dict;
 }
 
 const char* const AcceptInfo_Dev::kResultCode = "resultCode";
 const char* const AcceptInfo_Dev::kSocketId = "socketId";
 
 AcceptInfo_Dev::AcceptInfo_Dev()
     : result_code(kResultCode),
       socket_id(kSocketId) {
 }
 
 AcceptInfo_Dev::~AcceptInfo_Dev() {
 }
 
 bool AcceptInfo_Dev::Populate(const PP_Ext_Socket_AcceptInfo_Dev& value) {
   if (value.type != PP_VARTYPE_DICTIONARY)
     return false;
 
-  VarDictionary_Dev dict(value);
+  VarDictionary dict(value);
   bool result = result_code.Populate(dict);
   result = socket_id.Populate(dict) && result;
 
   return result;
 }
 
 Var AcceptInfo_Dev::CreateVar() const {
-  VarDictionary_Dev dict;
+  VarDictionary dict;
 
   bool result = result_code.AddTo(&dict);
   result = socket_id.MayAddTo(&dict) && result;
   PP_DCHECK(result);
 
   return dict;
 }
 
 const char* const ReadInfo_Dev::kResultCode = "resultCode";
 const char* const ReadInfo_Dev::kData = "data";
 
 ReadInfo_Dev::ReadInfo_Dev()
     : result_code(kResultCode),
       data(kData) {
 }
 
 ReadInfo_Dev::~ReadInfo_Dev() {
 }
 
 bool ReadInfo_Dev::Populate(const PP_Ext_Socket_ReadInfo_Dev& value) {
   if (value.type != PP_VARTYPE_DICTIONARY)
     return false;
 
-  VarDictionary_Dev dict(value);
+  VarDictionary dict(value);
   bool result = result_code.Populate(dict);
   result = data.Populate(dict) && result;
 
   return result;
 }
 
 Var ReadInfo_Dev::CreateVar() const {
-  VarDictionary_Dev dict;
+  VarDictionary dict;
 
   bool result = result_code.AddTo(&dict);
   result = data.AddTo(&dict) && result;
   PP_DCHECK(result);
 
   return dict;
 }
 
 const char* const WriteInfo_Dev::kBytesWritten = "bytesWritten";
 
 WriteInfo_Dev::WriteInfo_Dev()
     : bytes_written(kBytesWritten) {
 }
 
 WriteInfo_Dev::~WriteInfo_Dev() {
 }
 
 bool WriteInfo_Dev::Populate(const PP_Ext_Socket_WriteInfo_Dev& value) {
   if (value.type != PP_VARTYPE_DICTIONARY)
     return false;
 
-  VarDictionary_Dev dict(value);
+  VarDictionary dict(value);
   bool result = bytes_written.Populate(dict);
 
   return result;
 }
 
 Var WriteInfo_Dev::CreateVar() const {
-  VarDictionary_Dev dict;
+  VarDictionary dict;
 
   bool result = bytes_written.AddTo(&dict);
   // Suppress unused variable warnings.
   static_cast<void>(result);
   PP_DCHECK(result);
 
   return dict;
 }
 
 const char* const RecvFromInfo_Dev::kResultCode = "resultCode";
 const char* const RecvFromInfo_Dev::kData = "data";
 const char* const RecvFromInfo_Dev::kAddress = "address";
 const char* const RecvFromInfo_Dev::kPort = "port";
 
 RecvFromInfo_Dev::RecvFromInfo_Dev()
     : result_code(kResultCode),
       data(kData),
       address(kAddress),
       port(kPort) {
 }
 
 RecvFromInfo_Dev::~RecvFromInfo_Dev() {
 }
 
 bool RecvFromInfo_Dev::Populate(const PP_Ext_Socket_RecvFromInfo_Dev& value) {
   if (value.type != PP_VARTYPE_DICTIONARY)
     return false;
 
-  VarDictionary_Dev dict(value);
+  VarDictionary dict(value);
   bool result = result_code.Populate(dict);
   result = data.Populate(dict) && result;
   result = address.Populate(dict) && result;
   result = port.Populate(dict) && result;
 
   return result;
 }
 
 Var RecvFromInfo_Dev::CreateVar() const {
-  VarDictionary_Dev dict;
+  VarDictionary dict;
 
   bool result = result_code.AddTo(&dict);
   result = data.AddTo(&dict) && result;
   result = address.AddTo(&dict) && result;
   result = port.AddTo(&dict) && result;
   PP_DCHECK(result);
 
   return dict;
 }
 
@@ skipping 13 matching lines @@
       local_port(kLocalPort) {
 }
 
 SocketInfo_Dev::~SocketInfo_Dev() {
 }
 
 bool SocketInfo_Dev::Populate(const PP_Ext_Socket_SocketInfo_Dev& value) {
   if (value.type != PP_VARTYPE_DICTIONARY)
     return false;
 
-  VarDictionary_Dev dict(value);
+  VarDictionary dict(value);
   bool result = socket_type.Populate(dict);
   result = connected.Populate(dict) && result;
   result = peer_address.Populate(dict) && result;
   result = peer_port.Populate(dict) && result;
   result = local_address.Populate(dict) && result;
   result = local_port.Populate(dict) && result;
 
   return result;
 }
 
 Var SocketInfo_Dev::CreateVar() const {
-  VarDictionary_Dev dict;
+  VarDictionary dict;
 
   bool result = socket_type.AddTo(&dict);
   result = connected.AddTo(&dict) && result;
   result = peer_address.MayAddTo(&dict) && result;
   result = peer_port.MayAddTo(&dict) && result;
   result = local_address.MayAddTo(&dict) && result;
   result = local_port.MayAddTo(&dict) && result;
   PP_DCHECK(result);
 
   return dict;
 }
 
 const char* const NetworkInterface_Dev::kName = "name";
 const char* const NetworkInterface_Dev::kAddress = "address";
 
 NetworkInterface_Dev::NetworkInterface_Dev()
     : name(kName),
       address(kAddress) {
 }
 
 NetworkInterface_Dev::~NetworkInterface_Dev() {
 }
 
 bool NetworkInterface_Dev::Populate(
     const PP_Ext_Socket_NetworkInterface_Dev& value) {
   if (value.type != PP_VARTYPE_DICTIONARY)
     return false;
 
-  VarDictionary_Dev dict(value);
+  VarDictionary dict(value);
   bool result = name.Populate(dict);
   result = address.Populate(dict) && result;
 
   return result;
 }
 
 Var NetworkInterface_Dev::CreateVar() const {
-  VarDictionary_Dev dict;
+  VarDictionary dict;
 
   bool result = name.AddTo(&dict);
   result = address.AddTo(&dict) && result;
   PP_DCHECK(result);
 
   return dict;
 }
 
 Socket_Dev::Socket_Dev(const InstanceHandle& instance) : instance_(instance) {
 }
@@ skipping 332 matching lines @@
   return get_interface<PPB_Ext_Socket_Dev_0_2>()->GetJoinedGroups(
       instance_.pp_instance(),
       socket_id_var.pp_var(),
       callback.output(),
       callback.pp_completion_callback());
 }
 
 }  // namespace socket
 }  // namespace ext
 }  // namespace pp