[fsp] Use auto generated methods for generating dictionaries.

chrome/browser/chromeos/file_system_provider/operations/read_directory_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 "chrome/browser/chromeos/file_system_provider/operations/read_directory.h"
 
 #include <string>
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
@@ skipping 74 matching lines @@
                                kFileSystemId,
                                "" /* display_name */,
                                false /* writable */,
                                base::FilePath() /* mount_path */);
   }
 
   ProvidedFileSystemInfo file_system_info_;
 };
 
 TEST_F(FileSystemProviderOperationsReadDirectoryTest, Execute) {
+  using extensions::api::file_system_provider::ReadDirectoryRequestedOptions;
+
   util::LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   CallbackLogger callback_logger;
 
   ReadDirectory read_directory(NULL,
                                file_system_info_,
                                base::FilePath::FromUTF8Unsafe(kDirectoryPath),
                                base::Bind(&CallbackLogger::OnReadDirectory,
                                           base::Unretained(&callback_logger)));
   read_directory.SetDispatchEventImplForTesting(
       base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(read_directory.Execute(kRequestId));
 
   ASSERT_EQ(1u, dispatcher.events().size());
   extensions::Event* event = dispatcher.events()[0];
   EXPECT_EQ(extensions::api::file_system_provider::OnReadDirectoryRequested::
                 kEventName,
             event->event_name);
   base::ListValue* event_args = event->event_args.get();
   ASSERT_EQ(1u, event_args->GetSize());
 
-  base::DictionaryValue* options = NULL;
-  ASSERT_TRUE(event_args->GetDictionary(0, &options));
+  const base::DictionaryValue* options_as_value = NULL;
+  ASSERT_TRUE(event_args->GetDictionary(0, &options_as_value));
 
-  std::string 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(options->GetInteger("requestId", &event_request_id));
-  EXPECT_EQ(kRequestId, event_request_id);
-
-  std::string event_directory_path;
-  EXPECT_TRUE(options->GetString("directoryPath", &event_directory_path));
-  EXPECT_EQ(kDirectoryPath, event_directory_path);
+  ReadDirectoryRequestedOptions options;
+  ASSERT_TRUE(
+      ReadDirectoryRequestedOptions::Populate(*options_as_value, &options));
+  EXPECT_EQ(kFileSystemId, options.file_system_id);
+  EXPECT_EQ(kRequestId, options.request_id);
+  EXPECT_EQ(kDirectoryPath, options.directory_path);
 }
 
 TEST_F(FileSystemProviderOperationsReadDirectoryTest, Execute_NoListener) {
   util::LoggingDispatchEventImpl dispatcher(false /* dispatch_reply */);
   CallbackLogger callback_logger;
 
   ReadDirectory read_directory(NULL,
                                file_system_info_,
                                base::FilePath::FromUTF8Unsafe(kDirectoryPath),
                                base::Bind(&CallbackLogger::OnReadDirectory,
@@ skipping 97 matching lines @@
 
   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());
   ASSERT_EQ(0u, event->entry_list().size());
 }
 
 }  // namespace operations
 }  // namespace file_system_provider
 }  // namespace chromeos