| Index: chrome/browser/extensions/extension_service.h
|
| diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
|
| index 1b4c741e02c454c1ab9e437c93a2b987ae522869..b0c38442aa61a0bd4392bd871c7c09a8e589d94f 100644
|
| --- a/chrome/browser/extensions/extension_service.h
|
| +++ b/chrome/browser/extensions/extension_service.h
|
| @@ -193,17 +193,13 @@ class ExtensionService
|
|
|
| // Reloads the specified extension, sending the onLaunched() event to it if it
|
| // currently has any window showing.
|
| - void ReloadExtension(const std::string extension_id);
|
| + void ReloadExtension(const std::string& extension_id);
|
|
|
| // Uninstalls the specified extension. Callers should only call this method
|
| // with extensions that exist. |external_uninstall| is a magical parameter
|
| // that is only used to send information to ExtensionPrefs, which external
|
| // callers should never set to true.
|
| //
|
| - // We pass the |extension_id| by value to avoid having it deleted from under
|
| - // us incase someone calls it with Extension::id() or another string that we
|
| - // are going to delete in this function.
|
| - //
|
| // TODO(aa): Remove |external_uninstall| -- this information should be passed
|
| // to ExtensionPrefs some other way.
|
| virtual bool UninstallExtension(const std::string& extension_id,
|
| @@ -701,8 +697,8 @@ class ExtensionService
|
| UnloadBlacklistedExtensionPolicy);
|
| FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
|
| WillNotLoadBlacklistedExtensionsFromDirectory);
|
| - FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
|
| - BlacklistedInPrefsFromStartup);
|
| + FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest, ReloadBlacklistedExtension);
|
| + FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest, BlacklistedInPrefsFromStartup);
|
| FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
|
| GreylistedExtensionDisabled);
|
| FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
|
|
|