Revert of Mark forwarded user gestures as forwarded, and don't forward already forwarded gestures.

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"
@@ skipping 11 matching lines @@
 #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/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 "third_party/WebKit/public/web/WebUserGestureToken.h"
 #include "v8/include/v8.h"
 
 // Message passing API example (in a content script):
 // var extension =
 //    new chrome.Extension('00123456789abcdef0123456789abcdef0123456');
 // var port = runtime.connect();
 // port.postMessage('Can you hear me now?');
 // port.onmessage.addListener(function(msg, port) {
 //   alert('response=' + msg);
 //   port.postMessage('I got your reponse');
@@ skipping 55 matching lines @@
   }
 
   virtual ~ExtensionImpl() {}
 
  private:
   void ClearPortDataAndNotifyDispatcher(int port_id) {
     ClearPortData(port_id);
     dispatcher_->ClearPortData(port_id);
   }
 
-  bool ShouldForwardUserGesture() {
-    return blink::WebUserGestureIndicator::isProcessingUserGesture() &&
-           !blink::WebUserGestureIndicator::currentUserGestureToken()
-                .wasForwarded();
-  }
-
   // Sends a message along the given channel.
   void PostMessage(const v8::FunctionCallbackInfo<v8::Value>& args) {
     content::RenderView* renderview = context()->GetRenderView();
     if (!renderview)
       return;
 
     // Arguments are (int32 port_id, string message).
     CHECK(args.Length() == 2 && args[0]->IsInt32() && args[1]->IsString());
 
     int port_id = args[0]->Int32Value();
     if (!HasPortData(port_id)) {
       args.GetIsolate()->ThrowException(v8::Exception::Error(
           v8::String::NewFromUtf8(args.GetIsolate(), kPortClosedError)));
       return;
     }
 
     renderview->Send(new ExtensionHostMsg_PostMessage(
-        renderview->GetRoutingID(),
-        port_id,
-        Message(*v8::String::Utf8Value(args[1]), ShouldForwardUserGesture())));
+        renderview->GetRoutingID(), port_id,
+        Message(*v8::String::Utf8Value(args[1]),
+                blink::WebUserGestureIndicator::isProcessingUserGesture())));
   }
 
   // Forcefully disconnects a port.
   void CloseChannel(const v8::FunctionCallbackInfo<v8::Value>& args) {
     // Arguments are (int32 port_id, boolean notify_browser).
     CHECK_EQ(2, args.Length());
     CHECK(args[0]->IsInt32());
     CHECK(args[1]->IsBoolean());
 
     int port_id = args[0]->Int32Value();
@@ skipping 210 matching lines @@
 // static
 void MessagingBindings::DeliverMessage(
     const ScriptContextSet::ContextSet& contexts,
     int target_port_id,
     const Message& message,
     content::RenderView* restrict_to_render_view) {
   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);
-    blink::WebUserGestureIndicator::currentUserGestureToken().setForwarded();
     allow_window_focus.reset(new blink::WebScopedWindowFocusAllowedIndicator);
   }
 
   v8::Isolate* isolate = v8::Isolate::GetCurrent();
   v8::HandleScope handle_scope(isolate);
 
   // TODO(kalman): pass in the full ScriptContextSet; call ForEach.
   for (ScriptContextSet::ContextSet::const_iterator it = contexts.begin();
        it != contexts.end();
        ++it) {
@@ skipping 57 matching lines @@
           v8::String::NewFromUtf8(isolate, error_message.c_str()));
     } else {
       arguments.push_back(v8::Null(isolate));
     }
     (*it)->module_system()->CallModuleMethod(
         "messaging", "dispatchOnDisconnect", &arguments);
   }
 }
 
 }  // namespace extensions