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 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windows.h> | 8 #include <windows.h> |
9 #endif | 9 #endif |
10 | 10 |
(...skipping 21 matching lines...) Expand all Loading... |
32 | 32 |
33 #if defined(OS_WIN) | 33 #if defined(OS_WIN) |
34 #include "base/test/test_reg_util_win.h" | 34 #include "base/test/test_reg_util_win.h" |
35 #include "base/win/registry.h" | 35 #include "base/win/registry.h" |
36 #endif // OS_WIN | 36 #endif // OS_WIN |
37 | 37 |
38 scoped_refptr<extensions::Extension> AddMediaGalleriesApp( | 38 scoped_refptr<extensions::Extension> AddMediaGalleriesApp( |
39 const std::string& name, | 39 const std::string& name, |
40 const std::vector<std::string>& media_galleries_permissions, | 40 const std::vector<std::string>& media_galleries_permissions, |
41 Profile* profile) { | 41 Profile* profile) { |
42 scoped_ptr<DictionaryValue> manifest(new DictionaryValue); | 42 scoped_ptr<base::DictionaryValue> manifest(new base::DictionaryValue); |
43 manifest->SetString(extensions::manifest_keys::kName, name); | 43 manifest->SetString(extensions::manifest_keys::kName, name); |
44 manifest->SetString(extensions::manifest_keys::kVersion, "0.1"); | 44 manifest->SetString(extensions::manifest_keys::kVersion, "0.1"); |
45 manifest->SetInteger(extensions::manifest_keys::kManifestVersion, 2); | 45 manifest->SetInteger(extensions::manifest_keys::kManifestVersion, 2); |
46 ListValue* background_script_list = new ListValue; | 46 base::ListValue* background_script_list = new base::ListValue; |
47 background_script_list->Append(Value::CreateStringValue("background.js")); | 47 background_script_list->Append( |
| 48 base::Value::CreateStringValue("background.js")); |
48 manifest->Set(extensions::manifest_keys::kPlatformAppBackgroundScripts, | 49 manifest->Set(extensions::manifest_keys::kPlatformAppBackgroundScripts, |
49 background_script_list); | 50 background_script_list); |
50 | 51 |
51 ListValue* permission_detail_list = new ListValue; | 52 base::ListValue* permission_detail_list = new base::ListValue; |
52 for (size_t i = 0; i < media_galleries_permissions.size(); i++) | 53 for (size_t i = 0; i < media_galleries_permissions.size(); i++) |
53 permission_detail_list->Append( | 54 permission_detail_list->Append( |
54 Value::CreateStringValue(media_galleries_permissions[i])); | 55 base::Value::CreateStringValue(media_galleries_permissions[i])); |
55 DictionaryValue* media_galleries_permission = new DictionaryValue(); | 56 base::DictionaryValue* media_galleries_permission = |
| 57 new base::DictionaryValue(); |
56 media_galleries_permission->Set("mediaGalleries", permission_detail_list); | 58 media_galleries_permission->Set("mediaGalleries", permission_detail_list); |
57 ListValue* permission_list = new ListValue; | 59 base::ListValue* permission_list = new base::ListValue; |
58 permission_list->Append(media_galleries_permission); | 60 permission_list->Append(media_galleries_permission); |
59 manifest->Set(extensions::manifest_keys::kPermissions, permission_list); | 61 manifest->Set(extensions::manifest_keys::kPermissions, permission_list); |
60 | 62 |
61 extensions::ExtensionPrefs* extension_prefs = | 63 extensions::ExtensionPrefs* extension_prefs = |
62 extensions::ExtensionPrefs::Get(profile); | 64 extensions::ExtensionPrefs::Get(profile); |
63 base::FilePath path = extension_prefs->install_directory().AppendASCII(name); | 65 base::FilePath path = extension_prefs->install_directory().AppendASCII(name); |
64 std::string errors; | 66 std::string errors; |
65 scoped_refptr<extensions::Extension> extension = | 67 scoped_refptr<extensions::Extension> extension = |
66 extensions::Extension::Create(path, extensions::Manifest::INTERNAL, | 68 extensions::Extension::Create(path, extensions::Manifest::INTERNAL, |
67 *manifest.get(), | 69 *manifest.get(), |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
175 | 177 |
176 music_override_.reset(new base::ScopedPathOverride( | 178 music_override_.reset(new base::ScopedPathOverride( |
177 chrome::DIR_USER_MUSIC, fake_dir_.path().AppendASCII("music"))); | 179 chrome::DIR_USER_MUSIC, fake_dir_.path().AppendASCII("music"))); |
178 pictures_override_.reset(new base::ScopedPathOverride( | 180 pictures_override_.reset(new base::ScopedPathOverride( |
179 chrome::DIR_USER_PICTURES, fake_dir_.path().AppendASCII("pictures"))); | 181 chrome::DIR_USER_PICTURES, fake_dir_.path().AppendASCII("pictures"))); |
180 video_override_.reset(new base::ScopedPathOverride( | 182 video_override_.reset(new base::ScopedPathOverride( |
181 chrome::DIR_USER_VIDEOS, fake_dir_.path().AppendASCII("videos"))); | 183 chrome::DIR_USER_VIDEOS, fake_dir_.path().AppendASCII("videos"))); |
182 num_galleries_ = 3; | 184 num_galleries_ = 3; |
183 #endif // OS_CHROMEOS || OS_ANDROID | 185 #endif // OS_CHROMEOS || OS_ANDROID |
184 } | 186 } |
OLD | NEW |