[fsp] Use auto generated methods for generating dictionaries.

chrome/browser/chromeos/file_system_provider/operations/read_file_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_file.h"
 
 #include <string>
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
@@ skipping 73 matching lines @@
                                false /* writable */,
                                base::FilePath() /* mount_path */);
     io_buffer_ = make_scoped_refptr(new net::IOBuffer(kOffset + kLength));
   }
 
   ProvidedFileSystemInfo file_system_info_;
   scoped_refptr<net::IOBuffer> io_buffer_;
 };
 
 TEST_F(FileSystemProviderOperationsReadFileTest, Execute) {
+  using extensions::api::file_system_provider::ReadFileRequestedOptions;
+
   util::LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   CallbackLogger callback_logger;
 
   ReadFile read_file(NULL,
                      file_system_info_,
                      kFileHandle,
                      io_buffer_.get(),
                      kOffset,
                      kLength,
                      base::Bind(&CallbackLogger::OnReadFile,
                                 base::Unretained(&callback_logger)));
   read_file.SetDispatchEventImplForTesting(
       base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(read_file.Execute(kRequestId));
 
   ASSERT_EQ(1u, dispatcher.events().size());
   extensions::Event* event = dispatcher.events()[0];
   EXPECT_EQ(
       extensions::api::file_system_provider::OnReadFileRequested::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);
-
-  int event_file_handle = -1;
-  EXPECT_TRUE(options->GetInteger("openRequestId", &event_file_handle));
-  EXPECT_EQ(kFileHandle, event_file_handle);
-
-  double event_offset = -1;
-  EXPECT_TRUE(options->GetDouble("offset", &event_offset));
-  EXPECT_EQ(kOffset, static_cast<double>(event_offset));
-
-  int event_length = -1;
-  EXPECT_TRUE(options->GetInteger("length", &event_length));
-  EXPECT_EQ(kLength, event_length);
+  ReadFileRequestedOptions options;
+  ASSERT_TRUE(ReadFileRequestedOptions::Populate(*options_as_value, &options));
+  EXPECT_EQ(kFileSystemId, options.file_system_id);
+  EXPECT_EQ(kRequestId, options.request_id);
+  EXPECT_EQ(kFileHandle, options.open_request_id);
+  EXPECT_EQ(kOffset, static_cast<double>(options.offset));
+  EXPECT_EQ(kLength, options.length);
 }
 
 TEST_F(FileSystemProviderOperationsReadFileTest, Execute_NoListener) {
   util::LoggingDispatchEventImpl dispatcher(false /* dispatch_reply */);
   CallbackLogger callback_logger;
 
   ReadFile read_file(NULL,
                      file_system_info_,
                      kFileHandle,
                      io_buffer_.get(),
@@ skipping 80 matching lines @@
                     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