[fsp] Use auto generated methods for generating dictionaries.

chrome/browser/chromeos/file_system_provider/operations/close_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/close_file.h"
 
 #include <string>
 #include <vector>
 
 #include "base/files/file.h"
@@ skipping 30 matching lines @@
                                kFileSystemId,
                                "" /* display_name */,
                                false /* writable */,
                                base::FilePath() /* mount_path */);
   }
 
   ProvidedFileSystemInfo file_system_info_;
 };
 
 TEST_F(FileSystemProviderOperationsCloseFileTest, Execute) {
+  using extensions::api::file_system_provider::CloseFileRequestedOptions;
+
   util::LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   util::StatusCallbackLog callback_log;
 
   CloseFile close_file(NULL,
                        file_system_info_,
                        kOpenRequestId,
                        base::Bind(&util::LogStatusCallback, &callback_log));
   close_file.SetDispatchEventImplForTesting(
       base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(close_file.Execute(kRequestId));
 
   ASSERT_EQ(1u, dispatcher.events().size());
   extensions::Event* event = dispatcher.events()[0];
   EXPECT_EQ(
       extensions::api::file_system_provider::OnCloseFileRequested::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_open_request_id = -1;
-  EXPECT_TRUE(options->GetInteger("openRequestId", &event_open_request_id));
-  EXPECT_EQ(kOpenRequestId, event_open_request_id);
+  CloseFileRequestedOptions options;
+  ASSERT_TRUE(CloseFileRequestedOptions::Populate(*options_as_value, &options));
+  EXPECT_EQ(kFileSystemId, options.file_system_id);
+  EXPECT_EQ(kRequestId, options.request_id);
+  EXPECT_EQ(kOpenRequestId, options.open_request_id);
 }
 
 TEST_F(FileSystemProviderOperationsCloseFileTest, Execute_NoListener) {
   util::LoggingDispatchEventImpl dispatcher(false /* dispatch_reply */);
   util::StatusCallbackLog callback_log;
 
   CloseFile close_file(NULL,
                        file_system_info_,
                        kOpenRequestId,
                        base::Bind(&util::LogStatusCallback, &callback_log));
@@ skipping 42 matching lines @@
   close_file.OnError(kRequestId,
                      scoped_ptr<RequestValue>(new RequestValue()),
                      base::File::FILE_ERROR_TOO_MANY_OPENED);
   ASSERT_EQ(1u, callback_log.size());
   EXPECT_EQ(base::File::FILE_ERROR_TOO_MANY_OPENED, callback_log[0]);
 }
 
 }  // namespace operations
 }  // namespace file_system_provider
 }  // namespace chromeos