Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / renderer / pepper / chrome_renderer_pepper_host_factory.cc

diff --git a/src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc b/src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
index 3469001..447c4dd 100644 (file)
--- a/src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
+++ b/src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
@@ -24,19 +24,16 @@ using ppapi::host::ResourceHost;
 
 ChromeRendererPepperHostFactory::ChromeRendererPepperHostFactory(
     content::RendererPpapiHost* host)
-    : host_(host) {
-}
+    : host_(host) {}
 
-ChromeRendererPepperHostFactory::~ChromeRendererPepperHostFactory() {
-}
+ChromeRendererPepperHostFactory::~ChromeRendererPepperHostFactory() {}
 
-scoped_ptr<ResourceHost>
-ChromeRendererPepperHostFactory::CreateResourceHost(
+scoped_ptr<ResourceHost> ChromeRendererPepperHostFactory::CreateResourceHost(
     ppapi::host::PpapiHost* host,
     const ppapi::proxy::ResourceMessageCallParams& params,
     PP_Instance instance,
     const IPC::Message& message) {
-  DCHECK(host == host_->GetPpapiHost());
+  DCHECK_EQ(host_->GetPpapiHost(), host);
 
   // Make sure the plugin is giving us a valid instance for this resource.
   if (!host_->IsValidInstance(instance))
@@ -44,7 +41,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
 
   // Dev interfaces.
   if (host_->GetPpapiHost()->permissions().HasPermission(
-      ppapi::PERMISSION_DEV)) {
+          ppapi::PERMISSION_DEV)) {
     switch (message.type()) {
       case PpapiHostMsg_ExtensionsCommon_Create::ID: {
         return scoped_ptr<ResourceHost>(PepperExtensionsCommonHost::Create(
@@ -54,11 +51,11 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
   }
 
   if (host_->GetPpapiHost()->permissions().HasPermission(
-      ppapi::PERMISSION_FLASH)) {
+          ppapi::PERMISSION_FLASH)) {
     switch (message.type()) {
       case PpapiHostMsg_Flash_Create::ID: {
-        return scoped_ptr<ResourceHost>(new PepperFlashRendererHost(
-            host_, instance, params.pp_resource()));
+        return scoped_ptr<ResourceHost>(
+            new PepperFlashRendererHost(host_, instance, params.pp_resource()));
       }
       case PpapiHostMsg_FlashFullscreen_Create::ID: {
         return scoped_ptr<ResourceHost>(new PepperFlashFullscreenHost(
@@ -67,7 +64,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
       case PpapiHostMsg_FlashMenu_Create::ID: {
         ppapi::proxy::SerializedFlashMenu serialized_menu;
         if (ppapi::UnpackMessage<PpapiHostMsg_FlashMenu_Create>(
-            message, &serialized_menu)) {
+                message, &serialized_menu)) {
           return scoped_ptr<ResourceHost>(new PepperFlashMenuHost(
               host_, instance, params.pp_resource(), serialized_menu));
         }
@@ -88,7 +85,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
         ppapi::proxy::SerializedFontDescription description;
         PP_PrivateFontCharset charset;
         if (ppapi::UnpackMessage<PpapiHostMsg_FlashFontFile_Create>(
-            message, &description, &charset)) {
+                message, &description, &charset)) {
           return scoped_ptr<ResourceHost>(new PepperFlashFontFileHost(
               host_, instance, params.pp_resource(), description, charset));
         }
@@ -101,11 +98,11 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
   }
 
   if (host_->GetPpapiHost()->permissions().HasPermission(
-      ppapi::PERMISSION_PRIVATE)) {
+          ppapi::PERMISSION_PRIVATE)) {
     switch (message.type()) {
       case PpapiHostMsg_PDF_Create::ID: {
-        return scoped_ptr<ResourceHost>(new PepperPDFHost(
-            host_, instance, params.pp_resource()));
+        return scoped_ptr<ResourceHost>(
+            new PepperPDFHost(host_, instance, params.pp_resource()));
       }
     }
   }
@@ -116,8 +113,8 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
   // access to the other private interfaces.
   switch (message.type()) {
     case PpapiHostMsg_UMA_Create::ID: {
-      return scoped_ptr<ResourceHost>(new PepperUMAHost(
-          host_, instance, params.pp_resource()));
+      return scoped_ptr<ResourceHost>(
+          new PepperUMAHost(host_, instance, params.pp_resource()));
     }
   }