[Extensions] Convert APIs to use movable types [5]

chrome/browser/extensions/api/file_system/file_system_api_unittest.cc

 // Copyright (c) 2012 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/extensions/api/file_system/file_system_api.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 38 matching lines @@
                      const std::vector<base::FilePath::StringType>& actual) {
   EXPECT_EQ(expected.size(), actual.size());
   if (expected.size() != actual.size())
     return;
 
   for (size_t i = 0; i < expected.size(); ++i) {
     EXPECT_EQ(expected[i], actual[i]);
   }
 }
 
-AcceptOption* BuildAcceptOption(const std::string& description,
-                                const std::string& mime_types,
-                                const std::string& extensions) {
-  AcceptOption* option = new AcceptOption();
+AcceptOption BuildAcceptOption(const std::string& description,
+                               const std::string& mime_types,
+                               const std::string& extensions) {
+  AcceptOption option;
 
   if (!description.empty())
-    option->description.reset(new std::string(description));
+    option.description.reset(new std::string(description));
 
   if (!mime_types.empty()) {
-    option->mime_types.reset(new std::vector<std::string>(
-        base::SplitString(mime_types, ",",
-                          base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)));
+    option.mime_types.reset(new std::vector<std::string>(base::SplitString(
+        mime_types, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)));
   }
 
   if (!extensions.empty()) {
-    option->extensions.reset(new std::vector<std::string>(
-        base::SplitString(extensions, ",",
-                          base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)));
+    option.extensions.reset(new std::vector<std::string>(base::SplitString(
+        extensions, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)));
   }
 
   return option;
 }
 
 #if defined(OS_WIN)
 #define ToStringType base::UTF8ToWide
 #else
 #define ToStringType
 #endif
@@ skipping 104 matching lines @@
   // AcceptsAllTypes is ignored when no other extensions are available.
   ui::SelectFileDialog::FileTypeInfo file_type_info;
   bool acceptsAllTypes = false;
   FileSystemChooseEntryFunction::BuildFileTypeInfo(&file_type_info,
       base::FilePath::StringType(), NULL, &acceptsAllTypes);
   EXPECT_TRUE(file_type_info.include_all_files);
   EXPECT_TRUE(file_type_info.extensions.empty());
 
   // Test grouping of multiple types.
   file_type_info = ui::SelectFileDialog::FileTypeInfo();
-  std::vector<linked_ptr<AcceptOption> > options;
-  options.push_back(linked_ptr<AcceptOption>(BuildAcceptOption(
-      std::string(), "application/x-chrome-extension", "jso")));
+  std::vector<AcceptOption> options;
+  options.push_back(BuildAcceptOption(std::string(),
+                                      "application/x-chrome-extension", "jso"));
   acceptsAllTypes = false;
   FileSystemChooseEntryFunction::BuildFileTypeInfo(&file_type_info,
       base::FilePath::StringType(), &options, &acceptsAllTypes);
   EXPECT_FALSE(file_type_info.include_all_files);
   ASSERT_EQ(file_type_info.extensions.size(), (size_t) 1);
   EXPECT_TRUE(file_type_info.extension_description_overrides[0].empty()) <<
       "No override must be specified for boring accept types";
   // Note here (and below) that the expectedTypes are sorted, because we use a
   // set internally to generate the output: thus, the output is sorted.
   std::vector<base::FilePath::StringType> expectedTypes;
   expectedTypes.push_back(ToStringType("crx"));
   expectedTypes.push_back(ToStringType("jso"));
   CheckExtensions(expectedTypes, file_type_info.extensions[0]);
 
   // Test that not satisfying the extension will force all types.
   file_type_info = ui::SelectFileDialog::FileTypeInfo();
   options.clear();
-  options.push_back(linked_ptr<AcceptOption>(BuildAcceptOption(
-      std::string(), std::string(), "unrelated")));
+  options.push_back(
+      BuildAcceptOption(std::string(), std::string(), "unrelated"));
   acceptsAllTypes = false;
   FileSystemChooseEntryFunction::BuildFileTypeInfo(&file_type_info,
       ToStringType(".jso"), &options, &acceptsAllTypes);
   EXPECT_TRUE(file_type_info.include_all_files);
 
   // Test multiple list entries, all containing their own types.
   file_type_info = ui::SelectFileDialog::FileTypeInfo();
   options.clear();
-  options.push_back(linked_ptr<AcceptOption>(
-      BuildAcceptOption(std::string(), std::string(), "jso,js")));
-  options.push_back(linked_ptr<AcceptOption>(
-      BuildAcceptOption(std::string(), std::string(), "cpp,cc")));
+  options.push_back(BuildAcceptOption(std::string(), std::string(), "jso,js"));
+  options.push_back(BuildAcceptOption(std::string(), std::string(), "cpp,cc"));
   acceptsAllTypes = false;
   FileSystemChooseEntryFunction::BuildFileTypeInfo(&file_type_info,
       base::FilePath::StringType(), &options, &acceptsAllTypes);
   ASSERT_EQ(file_type_info.extensions.size(), options.size());
 
   expectedTypes.clear();
   expectedTypes.push_back(ToStringType("js"));
   expectedTypes.push_back(ToStringType("jso"));
   CheckExtensions(expectedTypes, file_type_info.extensions[0]);
 
   expectedTypes.clear();
   expectedTypes.push_back(ToStringType("cc"));
   expectedTypes.push_back(ToStringType("cpp"));
   CheckExtensions(expectedTypes, file_type_info.extensions[1]);
 
   // Test accept type that causes description override.
   file_type_info = ui::SelectFileDialog::FileTypeInfo();
   options.clear();
-  options.push_back(linked_ptr<AcceptOption>(
-      BuildAcceptOption(std::string(), "image/*", "html")));
+  options.push_back(BuildAcceptOption(std::string(), "image/*", "html"));
   acceptsAllTypes = false;
   FileSystemChooseEntryFunction::BuildFileTypeInfo(&file_type_info,
       base::FilePath::StringType(), &options, &acceptsAllTypes);
   ASSERT_EQ(file_type_info.extension_description_overrides.size(), (size_t) 1);
   EXPECT_FALSE(file_type_info.extension_description_overrides[0].empty()) <<
       "Accept type \"image/*\" must generate description override";
 
   // Test multiple accept types that cause description override causes us to
   // still present the default.
   file_type_info = ui::SelectFileDialog::FileTypeInfo();
   options.clear();
-  options.push_back(linked_ptr<AcceptOption>(BuildAcceptOption(
-      std::string(), "image/*,audio/*,video/*", std::string())));
+  options.push_back(BuildAcceptOption(std::string(), "image/*,audio/*,video/*",
+                                      std::string()));
   acceptsAllTypes = false;
   FileSystemChooseEntryFunction::BuildFileTypeInfo(&file_type_info,
       base::FilePath::StringType(), &options, &acceptsAllTypes);
   ASSERT_EQ(file_type_info.extension_description_overrides.size(), (size_t) 1);
   EXPECT_TRUE(file_type_info.extension_description_overrides[0].empty());
 
   // Test explicit description override.
   file_type_info = ui::SelectFileDialog::FileTypeInfo();
   options.clear();
-  options.push_back(linked_ptr<AcceptOption>(
-      BuildAcceptOption("File Types 101", "image/jpeg", std::string())));
+  options.push_back(
+      BuildAcceptOption("File Types 101", "image/jpeg", std::string()));
   acceptsAllTypes = false;
   FileSystemChooseEntryFunction::BuildFileTypeInfo(&file_type_info,
       base::FilePath::StringType(), &options, &acceptsAllTypes);
   EXPECT_EQ(file_type_info.extension_description_overrides[0],
       base::UTF8ToUTF16("File Types 101"));
 }
 
 TEST(FileSystemApiUnitTest, FileSystemChooseEntryFunctionSuggestionTest) {
   std::string opt_name;
   base::FilePath suggested_name;
@@ skipping 148 matching lines @@
     base::RunLoop().RunUntilIdle();
 
     EXPECT_EQ(1, delegate.show_dialog_counter());
     EXPECT_EQ(0, delegate.show_notification_counter());
     EXPECT_EQ(ConsentProvider::CONSENT_REJECTED, result);
   }
 }
 #endif
 
 }  // namespace extensions