Revert of Update extensions::MessagingBindings to use WebScopedWindowFocusAllowedIndicator with...

extensions/renderer/messaging_bindings.cc

 // Copyright 2014 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 "extensions/renderer/messaging_bindings.h"
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/v8_value_converter.h"
 #include "extensions/common/api/messaging/message.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/manifest_handlers/externally_connectable.h"
 #include "extensions/renderer/dispatcher.h"
 #include "extensions/renderer/event_bindings.h"
 #include "extensions/renderer/object_backed_native_handler.h"
 #include "extensions/renderer/scoped_persistent.h"
 #include "extensions/renderer/script_context.h"
 #include "extensions/renderer/script_context_set.h"
-#include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h"
 #include "third_party/WebKit/public/web/WebScopedUserGesture.h"
 #include "third_party/WebKit/public/web/WebScopedWindowFocusAllowedIndicator.h"
 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
 #include "v8/include/v8.h"
 
 // Message passing API example (in a content script):
 // var extension =
 //    new chrome.Extension('00123456789abcdef0123456789abcdef0123456');
@@ skipping 279 matching lines @@
           "messaging", "dispatchOnConnect", arraysize(arguments), arguments);
 
   if (!retval.IsEmpty()) {
     CHECK(retval->IsBoolean());
     *port_created |= retval->BooleanValue();
   } else {
     LOG(ERROR) << "Empty return value from dispatchOnConnect.";
   }
 }
 
-void DeliverMessageToScriptContext(const Message& message,
+void DeliverMessageToScriptContext(const std::string& message_data,
                                    int target_port_id,
                                    ScriptContext* script_context) {
   v8::Isolate* isolate = script_context->isolate();
   v8::HandleScope handle_scope(isolate);
 
   // Check to see whether the context has this port before bothering to create
   // the message.
   v8::Handle<v8::Value> port_id_handle =
       v8::Integer::New(isolate, target_port_id);
   v8::Handle<v8::Value> has_port =
       script_context->module_system()->CallModuleMethod(
           "messaging", "hasPort", 1, &port_id_handle);
 
   CHECK(!has_port.IsEmpty());
   if (!has_port->BooleanValue())
     return;
 
   std::vector<v8::Handle<v8::Value> > arguments;
   arguments.push_back(v8::String::NewFromUtf8(isolate,
-                                              message.data.c_str(),
+                                              message_data.c_str(),
                                               v8::String::kNormalString,
-                                              message.data.size()));
+                                              message_data.size()));
   arguments.push_back(port_id_handle);
-
-  scoped_ptr<blink::WebScopedUserGesture> web_user_gesture;
-  scoped_ptr<blink::WebScopedWindowFocusAllowedIndicator> allow_window_focus;
-  if (message.user_gesture) {
-    web_user_gesture.reset(new blink::WebScopedUserGesture);
-
-    if (script_context->web_frame()) {
-      blink::WebDocument document = script_context->web_frame()->document();
-      allow_window_focus.reset(new blink::WebScopedWindowFocusAllowedIndicator(
-          &document));
-    }
-  }
-
   script_context->module_system()->CallModuleMethod(
       "messaging", "dispatchOnMessage", &arguments);
 }
 
 void DispatchOnDisconnectToScriptContext(int port_id,
                                          const std::string& error_message,
                                          ScriptContext* script_context) {
   v8::Isolate* isolate = script_context->isolate();
   v8::HandleScope handle_scope(isolate);
 
@@ skipping 43 matching lines @@
         target_port_id, kReceivingEndDoesntExistError));
   }
 }
 
 // static
 void MessagingBindings::DeliverMessage(
     const ScriptContextSet& context_set,
     int target_port_id,
     const Message& message,
     content::RenderFrame* restrict_to_render_frame) {
+  scoped_ptr<blink::WebScopedUserGesture> web_user_gesture;
+  scoped_ptr<blink::WebScopedWindowFocusAllowedIndicator> allow_window_focus;
+  if (message.user_gesture) {
+    web_user_gesture.reset(new blink::WebScopedUserGesture);
+    allow_window_focus.reset(new blink::WebScopedWindowFocusAllowedIndicator);
+  }
+
   // TODO(robwu): ScriptContextSet.ForEach should accept RenderFrame*.
   content::RenderView* restrict_to_render_view =
       restrict_to_render_frame ? restrict_to_render_frame->GetRenderView()
                                : NULL;
   context_set.ForEach(
       restrict_to_render_view,
-      base::Bind(&DeliverMessageToScriptContext, message, target_port_id));
+      base::Bind(&DeliverMessageToScriptContext, message.data, target_port_id));
 }
 
 // static
 void MessagingBindings::DispatchOnDisconnect(
     const ScriptContextSet& context_set,
     int port_id,
     const std::string& error_message,
     content::RenderFrame* restrict_to_render_frame) {
   // TODO(robwu): ScriptContextSet.ForEach should accept RenderFrame*.
   content::RenderView* restrict_to_render_view =
       restrict_to_render_frame ? restrict_to_render_frame->GetRenderView()
                                : NULL;
   context_set.ForEach(
       restrict_to_render_view,
       base::Bind(&DispatchOnDisconnectToScriptContext, port_id, error_message));
 }
 
 }  // namespace extensions