Refactor extension event distribution to use Values instead of JSON strings.

chrome/browser/extensions/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 11 matching lines @@
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/context_menu_params.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 using testing::_;
 using testing::AtLeast;
+using testing::DeleteArg;
 using testing::InSequence;
 using testing::Return;
 using testing::SaveArg;
 
 namespace extensions {
 
 // Base class for tests.
 class MenuManagerTest : public testing::Test {
  public:
   MenuManagerTest() : ui_thread_(BrowserThread::UI, &message_loop_),
@@ skipping 326 matching lines @@
   ASSERT_TRUE(manager_.GetItemById(id1) == NULL);
   ASSERT_TRUE(manager_.GetItemById(item2->id()) != NULL);
 }
 
 // A mock message service for tests of MenuManager::ExecuteCommand.
 class MockEventRouter : public EventRouter {
  public:
   explicit MockEventRouter(Profile* profile) :
       EventRouter(profile) {}
 
-  MOCK_METHOD6(DispatchEventToExtension,
+  MOCK_METHOD6(DispatchEventToExtensionMock,
                void(const std::string& extension_id,
                     const std::string& event_name,
-                    const std::string& event_args,
+                    base::ListValue* event_args,
                     Profile* source_profile,
                     const GURL& event_url,
                     EventRouter::UserGestureState state));
 
+  virtual void DispatchEventToExtension(const std::string& extension_id,
+                                        const std::string& event_name,
+                                        scoped_ptr<base::ListValue> event_args,
+                                        Profile* source_profile,
+                                        const GURL& event_url,
+                                        EventRouter::UserGestureState state) {
+    DispatchEventToExtensionMock(extension_id, event_name, event_args.release(),
+                                 source_profile, event_url, state);
+  }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockEventRouter);
 };
 
 // A mock profile for tests of MenuManager::ExecuteCommand.
 class MockTestingProfile : public TestingProfile {
  public:
   MockTestingProfile() {}
   MOCK_METHOD0(GetExtensionEventRouter, EventRouter*());
@@ skipping 71 matching lines @@
   MenuItem* item = CreateTestItem(extension);
   MenuItem::Id id = item->id();
   ASSERT_TRUE(manager_.AddContextItem(extension, item));
 
   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;
+  base::ListValue* list = NULL;
   {
     InSequence s;
     EXPECT_CALL(*mock_event_router.get(),
-                DispatchEventToExtension(
+                DispatchEventToExtensionMock(
                     item->extension_id(),
-                  extensions::event_names::kOnContextMenus,
-                  _,
-                  &profile,
-                  GURL(),
-                  EventRouter::USER_GESTURE_ENABLED))
+                    extensions::event_names::kOnContextMenus,
+                    _,
+                    &profile,
+                    GURL(),
+                    EventRouter::USER_GESTURE_ENABLED))
       .Times(1)
-      .WillOnce(SaveArg<2>(&event_args));
+      .WillOnce(SaveArg<2>(&list));
   EXPECT_CALL(*mock_event_router.get(),
-              DispatchEventToExtension(
+              DispatchEventToExtensionMock(
                   item->extension_id(),
                   extensions::event_names::kOnContextMenuClicked,
                   _,
                   &profile,
                   GURL(),
                   EventRouter::USER_GESTURE_ENABLED))
-      .Times(1);
+      .Times(1)
+      .WillOnce(DeleteArg<2>());
   }
   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, base::JSON_ALLOW_TRAILING_COMMAS));
-  Value* value = result.get();
-  ASSERT_TRUE(result.get() != NULL);
-  ASSERT_EQ(Value::TYPE_LIST, value->GetType());
-  ListValue* list = static_cast<ListValue*>(value);
   ASSERT_EQ(2u, list->GetSize());
 
   DictionaryValue* info;
   ASSERT_TRUE(list->GetDictionary(0, &info));
 
   int tmp_id = 0;
   ASSERT_TRUE(info->GetInteger("menuItemId", &tmp_id));
   ASSERT_EQ(id.uid, tmp_id);
 
   std::string tmp;
   ASSERT_TRUE(info->GetString("mediaType", &tmp));
   ASSERT_EQ("image", tmp);
   ASSERT_TRUE(info->GetString("srcUrl", &tmp));
   ASSERT_EQ(params.src_url.spec(), tmp);
   ASSERT_TRUE(info->GetString("pageUrl", &tmp));
   ASSERT_EQ(params.page_url.spec(), tmp);
 
   string16 tmp16;
   ASSERT_TRUE(info->GetString("selectionText", &tmp16));
   ASSERT_EQ(params.selection_text, tmp16);
 
   bool bool_tmp = true;
   ASSERT_TRUE(info->GetBoolean("editable", &bool_tmp));
   ASSERT_EQ(params.is_editable, bool_tmp);
+
+  delete list;
 }
 
 // Test that there is always only one radio item selected.
 TEST_F(MenuManagerTest, SanitizeRadioButtons) {
   Extension* extension = AddExtension("test");
 
   // A single unchecked item should get checked
   MenuItem* item1 = CreateTestItem(extension);
 
   item1->set_type(MenuItem::RADIO);
@@ skipping 74 matching lines @@
   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());
 }
 
 }  // namespace extensions