| 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/themes/theme_syncable_service.h" | 5 #include "chrome/browser/themes/theme_syncable_service.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 | 182 |
| 183 // Create and add custom theme extension so the ThemeSyncableService can | 183 // Create and add custom theme extension so the ThemeSyncableService can |
| 184 // find it. | 184 // find it. |
| 185 theme_extension_ = MakeThemeExtension(base::FilePath(kExtensionFilePath), | 185 theme_extension_ = MakeThemeExtension(base::FilePath(kExtensionFilePath), |
| 186 kCustomThemeName, | 186 kCustomThemeName, |
| 187 GetThemeLocation(), | 187 GetThemeLocation(), |
| 188 kCustomThemeUrl); | 188 kCustomThemeUrl); |
| 189 extensions::APIPermissionSet empty_set; | 189 extensions::APIPermissionSet empty_set; |
| 190 extensions::ManifestPermissionSet empty_manifest_permissions; | 190 extensions::ManifestPermissionSet empty_manifest_permissions; |
| 191 extensions::URLPatternSet empty_extent; | 191 extensions::URLPatternSet empty_extent; |
| 192 scoped_refptr<extensions::PermissionSet> permissions = | 192 extensions::PermissionSet permissions(empty_set, empty_manifest_permissions, |
| 193 new extensions::PermissionSet(empty_set, empty_manifest_permissions, | 193 empty_extent, empty_extent); |
| 194 empty_extent, empty_extent); | |
| 195 extensions::ExtensionPrefs::Get(profile_.get()) | 194 extensions::ExtensionPrefs::Get(profile_.get()) |
| 196 ->AddGrantedPermissions(theme_extension_->id(), permissions.get()); | 195 ->AddGrantedPermissions(theme_extension_->id(), &permissions); |
| 197 service->AddExtension(theme_extension_.get()); | 196 service->AddExtension(theme_extension_.get()); |
| 198 extensions::ExtensionRegistry* registry = | 197 extensions::ExtensionRegistry* registry = |
| 199 extensions::ExtensionRegistry::Get(profile_.get()); | 198 extensions::ExtensionRegistry::Get(profile_.get()); |
| 200 ASSERT_EQ(1u, registry->enabled_extensions().size()); | 199 ASSERT_EQ(1u, registry->enabled_extensions().size()); |
| 201 } | 200 } |
| 202 | 201 |
| 203 // Overridden in PolicyInstalledThemeTest below. | 202 // Overridden in PolicyInstalledThemeTest below. |
| 204 virtual extensions::Manifest::Location GetThemeLocation() { | 203 virtual extensions::Manifest::Location GetThemeLocation() { |
| 205 return extensions::Manifest::INTERNAL; | 204 return extensions::Manifest::INTERNAL; |
| 206 } | 205 } |
| (...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 661 | 660 |
| 662 TEST_F(PolicyInstalledThemeTest, InstallThemeByPolicy) { | 661 TEST_F(PolicyInstalledThemeTest, InstallThemeByPolicy) { |
| 663 // Set up theme service to use custom theme that was installed by policy. | 662 // Set up theme service to use custom theme that was installed by policy. |
| 664 fake_theme_service_->SetTheme(theme_extension_.get()); | 663 fake_theme_service_->SetTheme(theme_extension_.get()); |
| 665 | 664 |
| 666 syncer::SyncDataList data_list = | 665 syncer::SyncDataList data_list = |
| 667 theme_sync_service_->GetAllSyncData(syncer::THEMES); | 666 theme_sync_service_->GetAllSyncData(syncer::THEMES); |
| 668 | 667 |
| 669 ASSERT_EQ(0u, data_list.size()); | 668 ASSERT_EQ(0u, data_list.size()); |
| 670 } | 669 } |
| OLD | NEW |