OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/media_galleries/media_galleries_test_util.h" | 5 #include "chrome/browser/media_galleries/media_galleries_test_util.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
| 9 #include <utility> |
| 10 |
9 #include "base/base_paths.h" | 11 #include "base/base_paths.h" |
10 #include "base/files/file_path.h" | 12 #include "base/files/file_path.h" |
11 #include "base/files/file_util.h" | 13 #include "base/files/file_util.h" |
12 #include "base/path_service.h" | 14 #include "base/path_service.h" |
13 #include "base/strings/string_number_conversions.h" | 15 #include "base/strings/string_number_conversions.h" |
14 #include "base/strings/stringprintf.h" | 16 #include "base/strings/stringprintf.h" |
15 #include "build/build_config.h" | 17 #include "build/build_config.h" |
16 #include "chrome/browser/extensions/extension_service.h" | 18 #include "chrome/browser/extensions/extension_service.h" |
17 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h" | 19 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h" |
18 #include "chrome/browser/profiles/profile.h" | 20 #include "chrome/browser/profiles/profile.h" |
(...skipping 26 matching lines...) Expand all Loading... |
45 manifest->SetString(extensions::manifest_keys::kVersion, "0.1"); | 47 manifest->SetString(extensions::manifest_keys::kVersion, "0.1"); |
46 manifest->SetInteger(extensions::manifest_keys::kManifestVersion, 2); | 48 manifest->SetInteger(extensions::manifest_keys::kManifestVersion, 2); |
47 base::ListValue* background_script_list = new base::ListValue; | 49 base::ListValue* background_script_list = new base::ListValue; |
48 background_script_list->AppendString("background.js"); | 50 background_script_list->AppendString("background.js"); |
49 manifest->Set(extensions::manifest_keys::kPlatformAppBackgroundScripts, | 51 manifest->Set(extensions::manifest_keys::kPlatformAppBackgroundScripts, |
50 background_script_list); | 52 background_script_list); |
51 | 53 |
52 base::ListValue* permission_detail_list = new base::ListValue; | 54 base::ListValue* permission_detail_list = new base::ListValue; |
53 for (size_t i = 0; i < media_galleries_permissions.size(); i++) | 55 for (size_t i = 0; i < media_galleries_permissions.size(); i++) |
54 permission_detail_list->AppendString(media_galleries_permissions[i]); | 56 permission_detail_list->AppendString(media_galleries_permissions[i]); |
55 base::DictionaryValue* media_galleries_permission = | 57 std::unique_ptr<base::DictionaryValue> media_galleries_permission( |
56 new base::DictionaryValue(); | 58 new base::DictionaryValue()); |
57 media_galleries_permission->Set("mediaGalleries", permission_detail_list); | 59 media_galleries_permission->Set("mediaGalleries", permission_detail_list); |
58 base::ListValue* permission_list = new base::ListValue; | 60 base::ListValue* permission_list = new base::ListValue; |
59 permission_list->Append(media_galleries_permission); | 61 permission_list->Append(std::move(media_galleries_permission)); |
60 manifest->Set(extensions::manifest_keys::kPermissions, permission_list); | 62 manifest->Set(extensions::manifest_keys::kPermissions, permission_list); |
61 | 63 |
62 extensions::ExtensionPrefs* extension_prefs = | 64 extensions::ExtensionPrefs* extension_prefs = |
63 extensions::ExtensionPrefs::Get(profile); | 65 extensions::ExtensionPrefs::Get(profile); |
64 base::FilePath path = extension_prefs->install_directory().AppendASCII(name); | 66 base::FilePath path = extension_prefs->install_directory().AppendASCII(name); |
65 std::string errors; | 67 std::string errors; |
66 scoped_refptr<extensions::Extension> extension = | 68 scoped_refptr<extensions::Extension> extension = |
67 extensions::Extension::Create(path, extensions::Manifest::INTERNAL, | 69 extensions::Extension::Create(path, extensions::Manifest::INTERNAL, |
68 *manifest.get(), | 70 *manifest.get(), |
69 extensions::Extension::NO_FLAGS, &errors); | 71 extensions::Extension::NO_FLAGS, &errors); |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
216 | 218 |
217 base::FilePath MakeMediaGalleriesTestingPath(const std::string& dir) { | 219 base::FilePath MakeMediaGalleriesTestingPath(const std::string& dir) { |
218 #if defined(OS_WIN) | 220 #if defined(OS_WIN) |
219 return base::FilePath(FILE_PATH_LITERAL("C:\\")).AppendASCII(dir); | 221 return base::FilePath(FILE_PATH_LITERAL("C:\\")).AppendASCII(dir); |
220 #elif defined(OS_POSIX) | 222 #elif defined(OS_POSIX) |
221 return base::FilePath(FILE_PATH_LITERAL("/")).Append(dir); | 223 return base::FilePath(FILE_PATH_LITERAL("/")).Append(dir); |
222 #else | 224 #else |
223 NOTREACHED(); | 225 NOTREACHED(); |
224 #endif | 226 #endif |
225 } | 227 } |
OLD | NEW |