Snapshot of all changes to get jumbo in blink and content.

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 <stddef.h>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
@@ skipping 19 matching lines @@
 #include "ppapi/host/resource_host.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/ppapi_permissions.h"
 
 #if defined(OS_CHROMEOS)
 #include "content/browser/renderer_host/pepper/pepper_vpn_provider_message_filter_chromeos.h"
 #endif
 
 using ppapi::host::MessageFilterHost;
 using ppapi::host::ResourceHost;
-using ppapi::host::ResourceMessageFilter;
 using ppapi::proxy::SerializedTrueTypeFontDesc;
 using ppapi::UnpackMessage;
 
 namespace content {
 
 namespace {
 
 const size_t kMaxSocketsAllowed = 1024;
 
 bool CanCreateSocket() {
@@ skipping 41 matching lines @@
     }
     case PpapiHostMsg_Gamepad_Create::ID: {
       return std::unique_ptr<ResourceHost>(
           new PepperGamepadHost(host_, instance, resource));
     }
     case PpapiHostMsg_NetworkProxy_Create::ID: {
       return std::unique_ptr<ResourceHost>(
           new PepperNetworkProxyHost(host_, instance, resource));
     }
     case PpapiHostMsg_HostResolver_Create::ID: {
-      scoped_refptr<ResourceMessageFilter> host_resolver(
+      scoped_refptr<ppapi::host::ResourceMessageFilter> host_resolver(
           new PepperHostResolverMessageFilter(host_, instance, false));
       return std::unique_ptr<ResourceHost>(new MessageFilterHost(
           host_->GetPpapiHost(), instance, resource, host_resolver));
     }
     case PpapiHostMsg_FileRef_CreateForFileAPI::ID: {
       PP_Resource file_system;
       std::string internal_path;
       if (!UnpackMessage<PpapiHostMsg_FileRef_CreateForFileAPI>(
               message, &file_system, &internal_path)) {
         NOTREACHED();
         return std::unique_ptr<ResourceHost>();
       }
       return std::unique_ptr<ResourceHost>(new PepperFileRefHost(
           host_, instance, resource, file_system, internal_path));
     }
     case PpapiHostMsg_TCPSocket_Create::ID: {
       ppapi::TCPSocketVersion version;
       if (!UnpackMessage<PpapiHostMsg_TCPSocket_Create>(message, &version) ||
           version == ppapi::TCP_SOCKET_VERSION_PRIVATE) {
         return std::unique_ptr<ResourceHost>();
       }
 
       return CreateNewTCPSocket(instance, resource, version);
     }
     case PpapiHostMsg_UDPSocket_Create::ID: {
       if (CanCreateSocket()) {
-        scoped_refptr<ResourceMessageFilter> udp_socket(
+        scoped_refptr<ppapi::host::ResourceMessageFilter> udp_socket(
             new PepperUDPSocketMessageFilter(host_, instance, false));
         return std::unique_ptr<ResourceHost>(new MessageFilterHost(
             host_->GetPpapiHost(), instance, resource, udp_socket));
       } else {
         return std::unique_ptr<ResourceHost>();
       }
     }
   }
 
   // Dev interfaces.
@@ skipping 43 matching lines @@
     }
   }
 
   // Permissions for the following interfaces will be checked at the
   // time of the corresponding instance's methods calls (because
   // permission check can be performed only on the UI
   // thread). Currently these interfaces are available only for
   // whitelisted apps which may not have access to the other private
   // interfaces.
   if (message.type() == PpapiHostMsg_HostResolver_CreatePrivate::ID) {
-    scoped_refptr<ResourceMessageFilter> host_resolver(
+    scoped_refptr<ppapi::host::ResourceMessageFilter> host_resolver(
         new PepperHostResolverMessageFilter(host_, instance, true));
     return std::unique_ptr<ResourceHost>(new MessageFilterHost(
         host_->GetPpapiHost(), instance, resource, host_resolver));
   }
   if (message.type() == PpapiHostMsg_TCPServerSocket_CreatePrivate::ID) {
     if (CanCreateSocket()) {
-      scoped_refptr<ResourceMessageFilter> tcp_server_socket(
+      scoped_refptr<ppapi::host::ResourceMessageFilter> tcp_server_socket(
           new PepperTCPServerSocketMessageFilter(this, host_, instance, true));
       return std::unique_ptr<ResourceHost>(new MessageFilterHost(
           host_->GetPpapiHost(), instance, resource, tcp_server_socket));
     } else {
       return std::unique_ptr<ResourceHost>();
     }
   }
   if (message.type() == PpapiHostMsg_TCPSocket_CreatePrivate::ID) {
     return CreateNewTCPSocket(instance, resource,
                               ppapi::TCP_SOCKET_VERSION_PRIVATE);
   }
   if (message.type() == PpapiHostMsg_UDPSocket_CreatePrivate::ID) {
     if (CanCreateSocket()) {
-      scoped_refptr<ResourceMessageFilter> udp_socket(
+      scoped_refptr<ppapi::host::ResourceMessageFilter> udp_socket(
           new PepperUDPSocketMessageFilter(host_, instance, true));
       return std::unique_ptr<ResourceHost>(new MessageFilterHost(
           host_->GetPpapiHost(), instance, resource, udp_socket));
     } else {
       return std::unique_ptr<ResourceHost>();
     }
   }
   if (message.type() == PpapiHostMsg_NetworkMonitor_Create::ID) {
     return std::unique_ptr<ResourceHost>(
         new PepperNetworkMonitorHost(host_, instance, resource));
   }
 
   // Flash interfaces.
   if (GetPermissions().HasPermission(ppapi::PERMISSION_FLASH)) {
     switch (message.type()) {
       case PpapiHostMsg_FlashFile_Create::ID: {
-        scoped_refptr<ResourceMessageFilter> file_filter(
+        scoped_refptr<ppapi::host::ResourceMessageFilter> file_filter(
             new PepperFlashFileMessageFilter(instance, host_));
         return std::unique_ptr<ResourceHost>(new MessageFilterHost(
             host_->GetPpapiHost(), instance, resource, file_filter));
       }
     }
   }
 
   return std::unique_ptr<ResourceHost>();
 }
 
 std::unique_ptr<ppapi::host::ResourceHost>
 ContentBrowserPepperHostFactory::CreateAcceptedTCPSocket(
     PP_Instance instance,
     ppapi::TCPSocketVersion version,
     std::unique_ptr<net::TCPSocket> socket) {
   if (!CanCreateSocket())
     return std::unique_ptr<ResourceHost>();
-  scoped_refptr<ResourceMessageFilter> tcp_socket(
+  scoped_refptr<ppapi::host::ResourceMessageFilter> tcp_socket(
       new PepperTCPSocketMessageFilter(host_, instance, version,
                                        std::move(socket)));
   return std::unique_ptr<ResourceHost>(
       new MessageFilterHost(host_->GetPpapiHost(), instance, 0, tcp_socket));
 }
 
 std::unique_ptr<ppapi::host::ResourceHost>
 ContentBrowserPepperHostFactory::CreateNewTCPSocket(
     PP_Instance instance,
     PP_Resource resource,
     ppapi::TCPSocketVersion version) {
   if (!CanCreateSocket())
     return std::unique_ptr<ResourceHost>();
 
-  scoped_refptr<ResourceMessageFilter> tcp_socket(
+  scoped_refptr<ppapi::host::ResourceMessageFilter> tcp_socket(
       new PepperTCPSocketMessageFilter(this, host_, instance, version));
   if (!tcp_socket.get())
     return std::unique_ptr<ResourceHost>();
 
   return std::unique_ptr<ResourceHost>(new MessageFilterHost(
       host_->GetPpapiHost(), instance, resource, tcp_socket));
 }
 
 const ppapi::PpapiPermissions& ContentBrowserPepperHostFactory::GetPermissions()
     const {
   return host_->GetPpapiHost()->permissions();
 }
 
 }  // namespace content