| Index: chrome/browser/extensions/extension_service_unittest.cc
|
| diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
|
| index 0fde625d54b5699d7babda5a2c4a4fd0dee8830e..a92926e94c8d5a409d6947f04f961e61f970c876 100644
|
| --- a/chrome/browser/extensions/extension_service_unittest.cc
|
| +++ b/chrome/browser/extensions/extension_service_unittest.cc
|
| @@ -1307,7 +1307,7 @@ TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectorySuccess) {
|
| extensions::ContentScriptsInfo::GetContentScripts(
|
| loaded_[index].get()).size());
|
| EXPECT_EQ(Manifest::INTERNAL, loaded_[index]->location());
|
| -};
|
| +}
|
|
|
| // Test loading bad extensions from the profile directory.
|
| TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectoryFail) {
|
| @@ -1343,7 +1343,7 @@ TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectoryFail) {
|
| std::string("Could not load extension from '*'. ") +
|
| extensions::manifest_errors::kManifestUnreadable)) <<
|
| base::UTF16ToUTF8(GetErrors()[3]);
|
| -};
|
| +}
|
|
|
| // Test various cases for delayed install because of missing imports.
|
| TEST_F(ExtensionServiceTest, PendingImports) {
|
| @@ -4258,7 +4258,7 @@ TEST_F(ExtensionServiceTest, ReloadExtensions) {
|
| base::FilePath path = data_dir().AppendASCII("good.crx");
|
| InstallCRX(path, INSTALL_NEW,
|
| Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT);
|
| - const char* extension_id = good_crx;
|
| + const char* const extension_id = good_crx;
|
| service()->DisableExtension(extension_id, Extension::DISABLE_USER_ACTION);
|
|
|
| EXPECT_EQ(0u, registry()->enabled_extensions().size());
|
| @@ -4297,7 +4297,7 @@ TEST_F(ExtensionServiceTest, ReloadExtension) {
|
| InitializeEmptyExtensionService();
|
|
|
| // Simple extension that should install without error.
|
| - const char* extension_id = "behllobkkfkfnphdnhnkndlbkcpglgmj";
|
| + const char extension_id[] = "behllobkkfkfnphdnhnkndlbkcpglgmj";
|
| base::FilePath ext = data_dir()
|
| .AppendASCII("good")
|
| .AppendASCII("Extensions")
|
| @@ -6474,7 +6474,7 @@ TEST_F(ExtensionServiceTest,
|
| EXPECT_FALSE(
|
| registry()->GenerateInstalledExtensionsSet()->Contains(extension_ids[1]));
|
| }
|
| -#endif // defined(ENABLE_MANAGED_USERS)
|
| +#endif // defined(ENABLE_MANAGED_USERS)
|
|
|
| TEST_F(ExtensionServiceTest, InstallPriorityExternalUpdateUrl) {
|
| InitializeEmptyExtensionService();
|
|
|