PPAPI: Move PPB_Messaging 1.2 to stable

content/renderer/pepper/message_channel.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/renderer/pepper/message_channel.h"
 
 #include <cstdlib>
 #include <string>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
-#include "content/public/common/content_client.h"
-#include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/pepper/host_array_buffer_var.h"
 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
 #include "content/renderer/pepper/pepper_try_catch.h"
 #include "content/renderer/pepper/plugin_module.h"
 #include "content/renderer/pepper/plugin_object.h"
 #include "content/renderer/pepper/v8_var_converter.h"
 #include "gin/arguments.h"
 #include "gin/converter.h"
 #include "gin/function_template.h"
 #include "gin/object_template_builder.h"
@@ skipping 31 matching lines @@
 const char kPostMessageAndAwaitResponse[] = "postMessageAndAwaitResponse";
 const char kV8ToVarConversionError[] =
     "Failed to convert a PostMessage "
     "argument from a JavaScript value to a PP_Var. It may have cycles or be of "
     "an unsupported type.";
 const char kVarToV8ConversionError[] =
     "Failed to convert a PostMessage "
     "argument from a PP_Var to a Javascript value. It may have cycles or be of "
     "an unsupported type.";
 
-bool HasDevPermission() {
-  return GetContentClient()->renderer()->IsPluginAllowedToUseDevChannelAPIs();
-}
-
 }  // namespace
 
 // MessageChannel --------------------------------------------------------------
 struct MessageChannel::VarConversionResult {
   VarConversionResult() : success_(false), conversion_completed_(false) {}
   void ConversionCompleted(const ScopedPPVar& var,
                            bool success) {
     conversion_completed_ = true;
     var_ = var;
     success_ = success;
@@ skipping 140 matching lines @@
     const std::string& identifier) {
   if (!instance_)
     return v8::Local<v8::Value>();
 
   PepperTryCatchV8 try_catch(instance_, V8VarConverter::kDisallowObjectVars,
                              isolate);
   if (identifier == kPostMessage) {
     return gin::CreateFunctionTemplate(isolate,
         base::Bind(&MessageChannel::PostMessageToNative,
                    weak_ptr_factory_.GetWeakPtr()))->GetFunction();
-  } else if (identifier == kPostMessageAndAwaitResponse && HasDevPermission()) {
+  } else if (identifier == kPostMessageAndAwaitResponse) {
     return gin::CreateFunctionTemplate(isolate,
         base::Bind(&MessageChannel::PostBlockingMessageToNative,
                    weak_ptr_factory_.GetWeakPtr()))->GetFunction();
   }
 
   std::map<std::string, ScopedPPVar>::const_iterator it =
       internal_named_properties_.find(identifier);
   if (it != internal_named_properties_.end()) {
     v8::Handle<v8::Value> result = try_catch.ToV8(it->second.get());
     if (try_catch.ThrowException())
       return v8::Local<v8::Value>();
     return result;
   }
 
   PluginObject* plugin_object = GetPluginObject(isolate);
   if (plugin_object)
     return plugin_object->GetNamedProperty(isolate, identifier);
   return v8::Local<v8::Value>();
 }
 
 bool MessageChannel::SetNamedProperty(v8::Isolate* isolate,
                                       const std::string& identifier,
                                       v8::Local<v8::Value> value) {
   if (!instance_)
     return false;
   PepperTryCatchV8 try_catch(instance_, V8VarConverter::kDisallowObjectVars,
                              isolate);
   if (identifier == kPostMessage ||
-      (identifier == kPostMessageAndAwaitResponse && HasDevPermission())) {
+      (identifier == kPostMessageAndAwaitResponse)) {
     try_catch.ThrowException("Cannot set properties with the name postMessage"
                              "or postMessageAndAwaitResponse");
     return true;
   }
 
   // We don't forward this to the passthrough object; no plugins use that
   // feature.
   // TODO(raymes): Remove SetProperty support from PPP_Class.
 
   return false;
 }
 
 std::vector<std::string> MessageChannel::EnumerateNamedProperties(
     v8::Isolate* isolate) {
   std::vector<std::string> result;
   PluginObject* plugin_object = GetPluginObject(isolate);
   if (plugin_object)
     result = plugin_object->EnumerateNamedProperties(isolate);
   result.push_back(kPostMessage);
-  if (HasDevPermission())
-    result.push_back(kPostMessageAndAwaitResponse);
+  result.push_back(kPostMessageAndAwaitResponse);
   return result;
 }
 
 void MessageChannel::PostMessageToNative(gin::Arguments* args) {
   if (!instance_)
     return;
   if (args->Length() != 1) {
     // TODO(raymes): Consider throwing an exception here. We don't now for
     // backward compatibility.
     return;
@@ skipping 183 matching lines @@
   if (!instance_)
     return;
   ppapi::proxy::HostDispatcher* dispatcher =
       ppapi::proxy::HostDispatcher::GetForInstance(instance_->pp_instance());
   // The dispatcher is NULL for in-process.
   if (dispatcher)
     dispatcher->RemoveSyncMessageStatusObserver(this);
 }
 
 }  // namespace content