Update extension events, routing, and delivery to use user gesture.

chrome/browser/extensions/extension_menu_manager_unittest.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 <vector>
 
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ skipping 334 matching lines @@
   ASSERT_TRUE(manager_.GetItemById(id1) == NULL);
   ASSERT_TRUE(manager_.GetItemById(item2->id()) != NULL);
 }
 
 // A mock message service for tests of ExtensionMenuManager::ExecuteCommand.
 class MockExtensionEventRouter : public ExtensionEventRouter {
  public:
   explicit MockExtensionEventRouter(Profile* profile) :
       ExtensionEventRouter(profile) {}
 
-  MOCK_METHOD5(DispatchEventToExtension, void(const std::string& extension_id,
-                                              const std::string& event_name,
-                                              const std::string& event_args,
-                                              Profile* source_profile,
-                                              const GURL& event_url));
+  MOCK_METHOD6(DispatchEventToExtension,
+               void(const std::string& extension_id,
+                    const std::string& event_name,
+                    const std::string& event_args,
+                    Profile* source_profile,
+                    const GURL& event_url,
+                    ExtensionEventRouter::UserGestureState state));
 
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockExtensionEventRouter);
 };
 
 // A mock profile for tests of ExtensionMenuManager::ExecuteCommand.
 class MockTestingProfile : public TestingProfile {
  public:
   MockTestingProfile() {}
@@ skipping 73 matching lines @@
 
   EXPECT_CALL(profile, GetExtensionEventRouter())
       .Times(1)
       .WillOnce(Return(mock_event_router.get()));
 
   // Use the magic of googlemock to save a parameter to our mock's
   // DispatchEventToExtension method into event_args.
   std::string event_args;
   std::string expected_event_name = "contextMenus";
   EXPECT_CALL(*mock_event_router.get(),
-              DispatchEventToExtension(item->extension_id(),
-                                       expected_event_name,
-                                       _,
-                                       &profile,
-                                       GURL()))
+              DispatchEventToExtension(
+                  item->extension_id(),
+                  expected_event_name,
+                  _,
+                  &profile,
+                  GURL(),
+                  ExtensionEventRouter::USER_GESTURE_ENABLED))
       .Times(1)
       .WillOnce(SaveArg<2>(&event_args));
 
   manager_.ExecuteCommand(&profile, NULL /* tab_contents */, params, id);
 
   // Parse the json event_args, which should turn into a 2-element list where
   // the first element is a dictionary we want to inspect for the correct
   // values.
   scoped_ptr<Value> result(base::JSONReader::Read(event_args, true));
   Value* value = result.get();
@@ skipping 109 matching lines @@
   manager_.ChangeParent(child1->id(), NULL);
   ASSERT_TRUE(new_item->checked());
   ASSERT_TRUE(child1->checked());
 
   // Removing |parent| should cause only |child1| to be selected.
   manager_.RemoveContextMenuItem(parent->id());
   parent = NULL;
   ASSERT_FALSE(new_item->checked());
   ASSERT_TRUE(child1->checked());
 }
-