Files.app: Let the file browser private tasks APIs use the auto-generated helper classes.

chrome/browser/chromeos/file_manager/file_tasks_unittest.cc

 // Copyright 2013 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_manager/file_tasks.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/prefs/pref_registry_simple.h"
@@ skipping 38 matching lines @@
 TEST(FileManagerFileTasksTest,
      FullTaskDescriptor_NonDriveAppWithIconAndDefault) {
   FullTaskDescriptor full_descriptor(
       TaskDescriptor("app-id",
                      TASK_TYPE_FILE_BROWSER_HANDLER,
                      "action-id"),
       "task title",
       GURL("http://example.com/icon.png"),
       true /* is_default */);
 
-  scoped_ptr<base::DictionaryValue> dictionary(
-      full_descriptor.AsDictionaryValue());
-  std::string task_id;
-  EXPECT_TRUE(dictionary->GetString("taskId", &task_id));
+  const std::string task_id =
+      TaskDescriptorToId(full_descriptor.task_descriptor());
   EXPECT_EQ("app-id|file|action-id", task_id);
-
-  std::string icon_url;
-  EXPECT_TRUE(dictionary->GetString("iconUrl", &icon_url));
-  EXPECT_EQ("http://example.com/icon.png", icon_url);
-
-  std::string title;
-  EXPECT_TRUE(dictionary->GetString("title", &title));
-  EXPECT_EQ("task title", title);
-
-  bool is_default = false;
-  EXPECT_TRUE(dictionary->GetBoolean("isDefault", &is_default));
-  EXPECT_TRUE(is_default);
+  EXPECT_EQ("http://example.com/icon.png", full_descriptor.icon_url().spec());
+  EXPECT_EQ("task title", full_descriptor.task_title());
+  EXPECT_TRUE(full_descriptor.is_default());
 }
 
 TEST(FileManagerFileTasksTest,
      FullTaskDescriptor_DriveAppWithoutIconAndNotDefault) {
   FullTaskDescriptor full_descriptor(
       TaskDescriptor("app-id",
                      TASK_TYPE_DRIVE_APP,
                      "action-id"),
       "task title",
       GURL(),  // No icon URL.
       false /* is_default */);
 
-  scoped_ptr<base::DictionaryValue> dictionary(
-      full_descriptor.AsDictionaryValue());
-  std::string task_id;
-  EXPECT_TRUE(dictionary->GetString("taskId", &task_id));
+  const std::string task_id =
+      TaskDescriptorToId(full_descriptor.task_descriptor());
   EXPECT_EQ("app-id|drive|action-id", task_id);
-
-  std::string icon_url;
-  EXPECT_FALSE(dictionary->GetString("iconUrl", &icon_url));
-
-  std::string title;
-  EXPECT_TRUE(dictionary->GetString("title", &title));
-  EXPECT_EQ("task title", title);
-
-  bool is_default = false;
-  EXPECT_TRUE(dictionary->GetBoolean("isDefault", &is_default));
-  EXPECT_FALSE(is_default);
+  EXPECT_TRUE(full_descriptor.icon_url().is_empty());
+  EXPECT_EQ("task title", full_descriptor.task_title());
+  EXPECT_FALSE(full_descriptor.is_default());
 }
 
 TEST(FileManagerFileTasksTest, MakeTaskID) {
   EXPECT_EQ("app-id|file|action-id",
             MakeTaskID("app-id", TASK_TYPE_FILE_BROWSER_HANDLER, "action-id"));
   EXPECT_EQ("app-id|app|action-id",
             MakeTaskID("app-id", TASK_TYPE_FILE_HANDLER, "action-id"));
   EXPECT_EQ("app-id|drive|action-id",
             MakeTaskID("app-id", TASK_TYPE_DRIVE_APP, "action-id"));
 }
@@ skipping 242 matching lines @@
       "text/plain"));
 
   // The internal file browser handler should be chosen as default, as it's a
   // fallback file browser handler.
   ChooseAndSetDefaultTask(pref_service, path_mime_set, &tasks);
   EXPECT_TRUE(tasks[0].is_default());
 }
 
 }  // namespace file_tasks
 }  // namespace file_manager.