Move PPB_VarArray and PPB_VarDictionary out of dev.

ppapi/cpp/extensions/dev/alarms_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/alarms_dev.h"
 
 #include "ppapi/cpp/completion_callback.h"
-#include "ppapi/cpp/dev/var_dictionary_dev.h"
 #include "ppapi/cpp/extensions/optional.h"
 #include "ppapi/cpp/extensions/to_var_converter.h"
 #include "ppapi/cpp/logging.h"
 #include "ppapi/cpp/module_impl.h"
+#include "ppapi/cpp/var_dictionary.h"
 
 namespace pp {
 
 namespace {
 
 template <> const char* interface_name<PPB_Ext_Alarms_Dev_0_1>() {
   return PPB_EXT_ALARMS_DEV_INTERFACE_0_1;
 }
 
 }  // namespace
@@ skipping 11 matching lines @@
       period_in_minutes(kPeriodInMinutes) {
 }
 
 Alarm_Dev::~Alarm_Dev() {
 }
 
 bool Alarm_Dev::Populate(const PP_Ext_Alarms_Alarm_Dev& value) {
   if (value.type != PP_VARTYPE_DICTIONARY)
     return false;
 
-  VarDictionary_Dev dict(value);
+  VarDictionary dict(value);
   bool result = name.Populate(dict);
   result = scheduled_time.Populate(dict) && result;
   result = period_in_minutes.Populate(dict) && result;
 
   return result;
 }
 
 Var Alarm_Dev::CreateVar() const {
-  VarDictionary_Dev dict;
+  VarDictionary dict;
 
   bool result = name.AddTo(&dict);
   result = scheduled_time.AddTo(&dict) && result;
   result = period_in_minutes.MayAddTo(&dict) && result;
   PP_DCHECK(result);
 
   return dict;
 }
 
 const char* const AlarmCreateInfo_Dev::kWhen = "when";
 const char* const AlarmCreateInfo_Dev::kDelayInMinutes = "delayInMinutes";
 const char* const AlarmCreateInfo_Dev::kPeriodInMinutes = "periodInMinutes";
 
 AlarmCreateInfo_Dev::AlarmCreateInfo_Dev()
     : when(kWhen),
       delay_in_minutes(kDelayInMinutes),
       period_in_minutes(kPeriodInMinutes) {
 }
 
 AlarmCreateInfo_Dev::~AlarmCreateInfo_Dev() {
 }
 
 bool AlarmCreateInfo_Dev::Populate(
     const PP_Ext_Alarms_AlarmCreateInfo_Dev& value) {
   if (value.type != PP_VARTYPE_DICTIONARY)
     return false;
 
-  VarDictionary_Dev dict(value);
+  VarDictionary dict(value);
   bool result = when.Populate(dict);
   result = delay_in_minutes.Populate(dict) && result;
   result = period_in_minutes.Populate(dict) && result;
 
   return result;
 }
 
 Var AlarmCreateInfo_Dev::CreateVar() const {
-  VarDictionary_Dev dict;
+  VarDictionary dict;
 
   bool result = when.MayAddTo(&dict);
   result = delay_in_minutes.MayAddTo(&dict) && result;
   result = period_in_minutes.MayAddTo(&dict) && result;
   PP_DCHECK(result);
 
   return dict;
 }
 
 Alarms_Dev::Alarms_Dev(const InstanceHandle& instance) : instance_(instance) {
@@ skipping 69 matching lines @@
 OnAlarmEvent_Dev::~OnAlarmEvent_Dev() {
 }
 
 void OnAlarmEvent_Dev::Callback(Alarm_Dev& alarm) {
   listener_->OnAlarm(alarm);
 }
 
 }  // namespace alarms
 }  // namespace ext
 }  // namespace pp