Merge 208513 "PPAPI: Move PPB_NetworkProxy out of Dev"

content/browser/renderer_host/pepper/content_browser_pepper_host_factory.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 "content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h"
 
 #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h"
 #include "content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.h"
 #include "content/browser/renderer_host/pepper/pepper_file_ref_host.h"
 #include "content/browser/renderer_host/pepper/pepper_file_system_browser_host.h"
@@ skipping 46 matching lines @@
         NOTREACHED();
         return scoped_ptr<ResourceHost>();
       }
       return scoped_ptr<ResourceHost>(new PepperFileSystemBrowserHost(
           host_, instance, params.pp_resource(), file_system_type));
     }
     case PpapiHostMsg_Gamepad_Create::ID: {
       return scoped_ptr<ResourceHost>(new PepperGamepadHost(
           host_, instance, params.pp_resource()));
     }
+    case PpapiHostMsg_NetworkProxy_Create::ID: {
+      return scoped_ptr<ResourceHost>(new PepperNetworkProxyHost(
+          host_, instance, params.pp_resource()));
+    }
     case PpapiHostMsg_HostResolver_Create::ID: {
       scoped_refptr<ResourceMessageFilter> host_resolver(
           new PepperHostResolverMessageFilter(host_, instance, false));
       return scoped_ptr<ResourceHost>(new MessageFilterHost(
           host_->GetPpapiHost(), instance, params.pp_resource(),
           host_resolver));
     }
     case PpapiHostMsg_FileRef_CreateInternal::ID: {
       PP_Resource file_system;
       std::string internal_path;
       if (!UnpackMessage<PpapiHostMsg_FileRef_CreateInternal>(
           message, &file_system, &internal_path)) {
         NOTREACHED();
         return scoped_ptr<ResourceHost>();
       }
       return scoped_ptr<ResourceHost>(new PepperFileRefHost(
           host_, instance, params.pp_resource(), file_system, internal_path));
     }
     case PpapiHostMsg_UDPSocket_Create::ID: {
       scoped_refptr<ResourceMessageFilter> udp_socket(
           new PepperUDPSocketMessageFilter(host_, instance, false));
       return scoped_ptr<ResourceHost>(new MessageFilterHost(
           host_->GetPpapiHost(), instance, params.pp_resource(), udp_socket));
     }
   }
 
   // Dev interfaces.
   if (GetPermissions().HasPermission(ppapi::PERMISSION_DEV)) {
     switch (message.type()) {
-      case PpapiHostMsg_NetworkProxy_Create::ID: {
-        return scoped_ptr<ResourceHost>(new PepperNetworkProxyHost(
-            host_, instance, params.pp_resource()));
-      }
       case PpapiHostMsg_Printing_Create::ID: {
-         scoped_ptr<PepperPrintSettingsManager> manager(
-             new PepperPrintSettingsManagerImpl());
-         return scoped_ptr<ResourceHost>(new PepperPrintingHost(
-             host_->GetPpapiHost(), instance,
-             params.pp_resource(), manager.Pass()));
+        scoped_ptr<PepperPrintSettingsManager> manager(
+            new PepperPrintSettingsManagerImpl());
+        return scoped_ptr<ResourceHost>(new PepperPrintingHost(
+            host_->GetPpapiHost(), instance,
+            params.pp_resource(), manager.Pass()));
       }
       case PpapiHostMsg_TrueTypeFontSingleton_Create::ID: {
         return scoped_ptr<ResourceHost>(new PepperTrueTypeFontListHost(
             host_, instance, params.pp_resource()));
       }
     }
   }
 
   // Private interfaces.
   if (GetPermissions().HasPermission(ppapi::PERMISSION_PRIVATE)) {
@@ skipping 38 matching lines @@
 
   return scoped_ptr<ResourceHost>();
 }
 
 const ppapi::PpapiPermissions&
 ContentBrowserPepperHostFactory::GetPermissions() const {
   return host_->GetPpapiHost()->permissions();
 }
 
 }  // namespace content