Pepper: Finish support for dev channel APIs.

ppapi/proxy/interface_list.cc

 // 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.
 
 #include "ppapi/proxy/interface_list.h"
 
 #include "base/lazy_instance.h"
 #include "base/memory/singleton.h"
 #include "ppapi/c/dev/ppb_alarms_dev.h"
 #include "ppapi/c/dev/ppb_audio_input_dev.h"
@@ skipping 136 matching lines @@
 namespace proxy {
 
 namespace {
 
 template<typename ProxyClass>
 InterfaceProxy* ProxyFactory(Dispatcher* dispatcher) {
   return new ProxyClass(dispatcher);
 }
 
 base::LazyInstance<PpapiPermissions> g_process_global_permissions;
-base::LazyInstance<bool> g_supports_dev_channel;
 
 }  // namespace
 
 InterfaceList::InterfaceList() {
   memset(id_to_factory_, 0, sizeof(id_to_factory_));
 
   // Register the API factories for each of the API types. This calls AddProxy
   // for each InterfaceProxy type we support.
   #define PROXIED_API(api_name) \
       AddProxy(PROXY_API_ID(api_name), &PROXY_FACTORY_NAME(api_name));
@@ skipping 18 matching lines @@
   {
     Permission current_required_permission = PERMISSION_PRIVATE;
     #include "ppapi/thunk/interfaces_ppb_private.h"
   }
   {
 #if !defined(OS_NACL)
     Permission current_required_permission = PERMISSION_FLASH;
     #include "ppapi/thunk/interfaces_ppb_private_flash.h"
 #endif  // !defined(OS_NACL)
   }
-
-  // TODO(teravest): Add dev channel interfaces here.
+  {
+    // TODO(teravest): These lines should be uncommented when a dev channel
+    // interface is added.  They're commented right now because they cause an
+    // unused variable warning.
+    //
+    // Permission current_required_permission = PERMISSION_DEV_CHANNEL;
+    // #include "ppapi/thunk/interfaces_ppb_public_dev_channel.h"
+  }
 
   #undef PROXIED_API
   #undef PROXIED_IFACE
 
   // Manually add some special proxies. Some of these don't have interfaces
   // that they support, so aren't covered by the macros above, but have proxies
   // for message routing. Others have different implementations between the
   // proxy and the impl and there's no obvious message routing.
   AddProxy(API_ID_RESOURCE_CREATION, &ResourceCreationProxy::Create);
   AddProxy(API_ID_PPP_CLASS, &PPP_Class_Proxy::Create);
@@ skipping 13 matching lines @@
   AddPPB(PPB_OPENGLES2_CHROMIUMENABLEFEATURE_INTERFACE_1_0,
          PPB_OpenGLES2_Shared::GetChromiumEnableFeatureInterface(),
          PERMISSION_NONE);
   AddPPB(PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE_1_0,
          PPB_OpenGLES2_Shared::GetChromiumMapSubInterface(), PERMISSION_NONE);
   AddPPB(PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE_1_0,
          PPB_OpenGLES2_Shared::GetChromiumMapSubInterface(), PERMISSION_NONE);
   AddPPB(PPB_OPENGLES2_QUERY_INTERFACE_1_0,
          PPB_OpenGLES2_Shared::GetQueryInterface(), PERMISSION_NONE);
   AddPPB(PPB_VAR_ARRAY_BUFFER_INTERFACE_1_0,
-         PPB_Var_Shared::GetVarArrayBufferInterface1_0(),
-         PERMISSION_NONE);
+         PPB_Var_Shared::GetVarArrayBufferInterface1_0(), PERMISSION_NONE);
   AddPPB(PPB_VAR_INTERFACE_1_1,
          PPB_Var_Shared::GetVarInterface1_1(), PERMISSION_NONE);
   AddPPB(PPB_VAR_INTERFACE_1_0,
          PPB_Var_Shared::GetVarInterface1_0(), PERMISSION_NONE);
 
 #if !defined(OS_NACL)
   // PPB (browser) interfaces.
   // Do not add more stuff here, they should be added to interface_list*.h
   // TODO(brettw) remove these.
   AddProxy(API_ID_PPB_INSTANCE_PRIVATE, &ProxyFactory<PPB_Instance_Proxy>);
@@ skipping 53 matching lines @@
 InterfaceList* InterfaceList::GetInstance() {
   return Singleton<InterfaceList>::get();
 }
 
 // static
 void InterfaceList::SetProcessGlobalPermissions(
     const PpapiPermissions& permissions) {
   g_process_global_permissions.Get() = permissions;
 }
 
-// static
-void InterfaceList::SetSupportsDevChannel(
-    bool supports_dev_channel) {
-  g_supports_dev_channel.Get() = supports_dev_channel;
-}
-
 InterfaceProxy::Factory InterfaceList::GetFactoryForID(ApiID id) const {
   int index = static_cast<int>(id);
   COMPILE_ASSERT(API_ID_NONE == 0, none_must_be_zero);
   if (id <= 0 || id >= API_ID_COUNT)
     return NULL;
   return id_to_factory_[index];
 }
 
 const void* InterfaceList::GetInterfaceForPPB(const std::string& name) const {
   NameToInterfaceInfoMap::const_iterator found =
       name_to_browser_info_.find(name);
   if (found == name_to_browser_info_.end())
     return NULL;
 
-  // Dev channel checking goes here.
-
   if (g_process_global_permissions.Get().HasPermission(
           found->second.required_permission))
     return found->second.iface;
   return NULL;
 }
 
 const void* InterfaceList::GetInterfaceForPPP(const std::string& name) const {
   NameToInterfaceInfoMap::const_iterator found =
       name_to_plugin_info_.find(name);
   if (found == name_to_plugin_info_.end())
@@ skipping 25 matching lines @@
 }
 
 void InterfaceList::AddPPP(const char* name,
                            const void* iface) {
   DCHECK(name_to_plugin_info_.find(name) == name_to_plugin_info_.end());
   name_to_plugin_info_[name] = InterfaceInfo(iface, PERMISSION_NONE);
 }
 
 }  // namespace proxy
 }  // namespace ppapi