| Index: chrome/browser/extensions/api/file_system/file_system_api_unittest.cc
|
| diff --git a/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc b/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc
|
| index 96da2930c76baf2900d1fa58a76c8968d2478f18..570c0fbc7b84f741f785eb38fbf2ade99701cce8 100644
|
| --- a/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc
|
| +++ b/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc
|
| @@ -70,8 +70,8 @@ TEST_F(FileSystemApiUnitTest, FileSystemChooseEntryFunctionFileTypeInfoTest) {
|
| // Test grouping of multiple types.
|
| file_type_info = ui::SelectFileDialog::FileTypeInfo();
|
| std::vector<linked_ptr<AcceptOption> > options;
|
| - options.push_back(linked_ptr<AcceptOption>(
|
| - BuildAcceptOption("", "application/x-chrome-extension", "jso")));
|
| + options.push_back(linked_ptr<AcceptOption>(BuildAcceptOption(
|
| + std::string(), "application/x-chrome-extension", "jso")));
|
| acceptsAllTypes = false;
|
| FileSystemChooseEntryFunction::BuildFileTypeInfo(&file_type_info,
|
| base::FilePath::StringType(), &options, &acceptsAllTypes);
|
| @@ -90,7 +90,7 @@ TEST_F(FileSystemApiUnitTest, FileSystemChooseEntryFunctionFileTypeInfoTest) {
|
| file_type_info = ui::SelectFileDialog::FileTypeInfo();
|
| options.clear();
|
| options.push_back(linked_ptr<AcceptOption>(
|
| - BuildAcceptOption("", "", "unrelated")));
|
| + BuildAcceptOption(std::string(), std::string(), "unrelated")));
|
| acceptsAllTypes = false;
|
| FileSystemChooseEntryFunction::BuildFileTypeInfo(&file_type_info,
|
| ToStringType(".jso"), &options, &acceptsAllTypes);
|
| @@ -100,9 +100,9 @@ TEST_F(FileSystemApiUnitTest, FileSystemChooseEntryFunctionFileTypeInfoTest) {
|
| file_type_info = ui::SelectFileDialog::FileTypeInfo();
|
| options.clear();
|
| options.push_back(linked_ptr<AcceptOption>(
|
| - BuildAcceptOption("", "", "jso,js")));
|
| + BuildAcceptOption(std::string(), std::string(), "jso,js")));
|
| options.push_back(linked_ptr<AcceptOption>(
|
| - BuildAcceptOption("", "", "cpp,cc")));
|
| + BuildAcceptOption(std::string(), std::string(), "cpp,cc")));
|
| acceptsAllTypes = false;
|
| FileSystemChooseEntryFunction::BuildFileTypeInfo(&file_type_info,
|
| base::FilePath::StringType(), &options, &acceptsAllTypes);
|
| @@ -122,7 +122,7 @@ TEST_F(FileSystemApiUnitTest, FileSystemChooseEntryFunctionFileTypeInfoTest) {
|
| file_type_info = ui::SelectFileDialog::FileTypeInfo();
|
| options.clear();
|
| options.push_back(linked_ptr<AcceptOption>(
|
| - BuildAcceptOption("", "image/*", "html")));
|
| + BuildAcceptOption(std::string(), "image/*", "html")));
|
| acceptsAllTypes = false;
|
| FileSystemChooseEntryFunction::BuildFileTypeInfo(&file_type_info,
|
| base::FilePath::StringType(), &options, &acceptsAllTypes);
|
| @@ -134,8 +134,8 @@ TEST_F(FileSystemApiUnitTest, FileSystemChooseEntryFunctionFileTypeInfoTest) {
|
| // still present the default.
|
| file_type_info = ui::SelectFileDialog::FileTypeInfo();
|
| options.clear();
|
| - options.push_back(linked_ptr<AcceptOption>(
|
| - BuildAcceptOption("", "image/*,audio/*,video/*", "")));
|
| + options.push_back(linked_ptr<AcceptOption>(BuildAcceptOption(
|
| + std::string(), "image/*,audio/*,video/*", std::string())));
|
| acceptsAllTypes = false;
|
| FileSystemChooseEntryFunction::BuildFileTypeInfo(&file_type_info,
|
| base::FilePath::StringType(), &options, &acceptsAllTypes);
|
| @@ -146,7 +146,7 @@ TEST_F(FileSystemApiUnitTest, FileSystemChooseEntryFunctionFileTypeInfoTest) {
|
| file_type_info = ui::SelectFileDialog::FileTypeInfo();
|
| options.clear();
|
| options.push_back(linked_ptr<AcceptOption>(
|
| - BuildAcceptOption("File Types 101", "image/jpeg", "")));
|
| + BuildAcceptOption("File Types 101", "image/jpeg", std::string())));
|
| acceptsAllTypes = false;
|
| FileSystemChooseEntryFunction::BuildFileTypeInfo(&file_type_info,
|
| base::FilePath::StringType(), &options, &acceptsAllTypes);
|
|
|