Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / file_system_provider / operations / delete_entry_unittest.cc

diff --git a/src/chrome/browser/chromeos/file_system_provider/operations/delete_entry_unittest.cc b/src/chrome/browser/chromeos/file_system_provider/operations/delete_entry_unittest.cc
index 9a40423..0f0fb13 100644 (file)
--- a/src/chrome/browser/chromeos/file_system_provider/operations/delete_entry_unittest.cc
+++ b/src/chrome/browser/chromeos/file_system_provider/operations/delete_entry_unittest.cc
@@ -16,8 +16,8 @@
 #include "chrome/common/extensions/api/file_system_provider.h"
 #include "chrome/common/extensions/api/file_system_provider_internal.h"
 #include "extensions/browser/event_router.h"
+#include "storage/browser/fileapi/async_file_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/browser/fileapi/async_file_util.h"
 
 namespace chromeos {
 namespace file_system_provider {
@@ -49,6 +49,8 @@ class FileSystemProviderOperationsDeleteEntryTest : public testing::Test {
 };
 
 TEST_F(FileSystemProviderOperationsDeleteEntryTest, Execute) {
+  using extensions::api::file_system_provider::DeleteEntryRequestedOptions;
+
   util::LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   util::StatusCallbackLog callback_log;
 
@@ -71,24 +73,16 @@ TEST_F(FileSystemProviderOperationsDeleteEntryTest, Execute) {
   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));
-
-  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_entry_path;
-  EXPECT_TRUE(options->GetString("entryPath", &event_entry_path));
-  EXPECT_EQ(kEntryPath, event_entry_path);
+  const base::DictionaryValue* options_as_value = NULL;
+  ASSERT_TRUE(event_args->GetDictionary(0, &options_as_value));
 
-  bool event_recursive;
-  EXPECT_TRUE(options->GetBoolean("recursive", &event_recursive));
-  EXPECT_TRUE(event_recursive);
+  DeleteEntryRequestedOptions options;
+  ASSERT_TRUE(
+      DeleteEntryRequestedOptions::Populate(*options_as_value, &options));
+  EXPECT_EQ(kFileSystemId, options.file_system_id);
+  EXPECT_EQ(kRequestId, options.request_id);
+  EXPECT_EQ(kEntryPath, options.entry_path);
+  EXPECT_TRUE(options.recursive);
 }
 
 TEST_F(FileSystemProviderOperationsDeleteEntryTest, Execute_NoListener) {