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

chrome/browser/chromeos/file_system_provider/operations/get_metadata_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 "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 111 matching lines @@
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(get_metadata.Execute(kRequestId));
 
   ASSERT_EQ(1u, dispatcher.events().size());
   extensions::Event* event = dispatcher.events()[0];
   EXPECT_EQ(
       extensions::api::file_system_provider::OnGetMetadataRequested::kEventName,
       event->event_name);
   base::ListValue* event_args = event->event_args.get();
-  ASSERT_EQ(3u, 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);
 
-  std::string event_directory_path;
-  EXPECT_TRUE(event_args->GetString(2, &event_directory_path));
-  EXPECT_EQ(kDirectoryPath, event_directory_path);
+  std::string event_entry_path;
+  EXPECT_TRUE(options->GetString("entryPath", &event_entry_path));
+  EXPECT_EQ(kDirectoryPath, event_entry_path);
 }
 
 TEST_F(FileSystemProviderOperationsGetMetadataTest, Execute_NoListener) {
   LoggingDispatchEventImpl dispatcher(false /* dispatch_reply */);
   CallbackLogger callback_logger;
 
   GetMetadata get_metadata(
       NULL,
       file_system_info_,
       base::FilePath::FromUTF8Unsafe(kDirectoryPath),
@@ skipping 93 matching lines @@
   get_metadata.OnError(kRequestId, base::File::FILE_ERROR_TOO_MANY_OPENED);
 
   ASSERT_EQ(1u, callback_logger.events().size());
   CallbackLogger::Event* event = callback_logger.events()[0];
   EXPECT_EQ(base::File::FILE_ERROR_TOO_MANY_OPENED, event->result());
 }
 
 }  // namespace operations
 }  // namespace file_system_provider
 }  // namespace chromeos