[fsp] Group arguments for API methods and events in dictionaries.

chrome/browser/chromeos/file_system_provider/operations/unmount_unittest.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 <string>
 #include <vector>
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 89 matching lines @@
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(unmount.Execute(kRequestId));
 
   ASSERT_EQ(1u, dispatcher.events().size());
   extensions::Event* event = dispatcher.events()[0];
   EXPECT_EQ(
       extensions::api::file_system_provider::OnUnmountRequested::kEventName,
       event->event_name);
   base::ListValue* event_args = event->event_args.get();
-  ASSERT_EQ(2u, event_args->GetSize());
+  ASSERT_EQ(1u, event_args->GetSize());
+
+  base::DictionaryValue* options = NULL;
+  ASSERT_TRUE(event_args->GetDictionary(0, &options));
 
   std::string event_file_system_id;
-  EXPECT_TRUE(event_args->GetString(0, &event_file_system_id));
+  EXPECT_TRUE(options->GetString("fileSystemId", &event_file_system_id));
   EXPECT_EQ(kFileSystemId, event_file_system_id);
 
   int event_request_id = -1;
-  EXPECT_TRUE(event_args->GetInteger(1, &event_request_id));
+  EXPECT_TRUE(options->GetInteger("requestId", &event_request_id));
   EXPECT_EQ(kRequestId, event_request_id);
 }
 
 TEST_F(FileSystemProviderOperationsUnmountTest, Execute_NoListener) {
   LoggingDispatchEventImpl dispatcher(false /* dispatch_reply */);
   CallbackLogger callback_logger;
 
   Unmount unmount(
       NULL,
       file_system_info_,
@@ skipping 49 matching lines @@
 
   unmount.OnError(kRequestId, base::File::FILE_ERROR_NOT_FOUND);
   ASSERT_EQ(1u, callback_logger.events().size());
   base::File::Error event_result = callback_logger.events()[0];
   EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND, event_result);
 }
 
 }  // namespace operations
 }  // namespace file_system_provider
 }  // namespace chromeos