| Index: chrome/browser/extensions/shared_module_service_unittest.cc
|
| diff --git a/chrome/browser/extensions/shared_module_service_unittest.cc b/chrome/browser/extensions/shared_module_service_unittest.cc
|
| index 388453ee53309bf20c1bc0aee3ef26359a9c23c1..1d8f5af02df8f1144b7313355f8090e99a048c61 100644
|
| --- a/chrome/browser/extensions/shared_module_service_unittest.cc
|
| +++ b/chrome/browser/extensions/shared_module_service_unittest.cc
|
| @@ -7,7 +7,7 @@
|
| #include "base/strings/string16.h"
|
| #include "base/values.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| -#include "chrome/browser/extensions/extension_service_unittest.h"
|
| +#include "chrome/browser/extensions/extension_service_test_base.h"
|
| #include "chrome/browser/extensions/pending_extension_manager.h"
|
| #include "chrome/browser/extensions/shared_module_service.h"
|
| #include "chrome/common/extensions/features/feature_channel.h"
|
| @@ -65,8 +65,8 @@ void SharedModuleServiceUnitTest::SetUp() {
|
| testing::AssertionResult SharedModuleServiceUnitTest::InstallExtension(
|
| const Extension* extension) {
|
| // Verify the extension is not already installed.
|
| - if (registry_->GetExtensionById(extension->id(),
|
| - ExtensionRegistry::ENABLED)) {
|
| + if (registry()->GetExtensionById(extension->id(),
|
| + ExtensionRegistry::ENABLED)) {
|
| return testing::AssertionFailure() << "Extension already installed.";
|
| }
|
|
|
| @@ -80,8 +80,8 @@ testing::AssertionResult SharedModuleServiceUnitTest::InstallExtension(
|
| false); // Don't wait for idle.
|
|
|
| // Verify that the extension is now installed.
|
| - if (!registry_->GetExtensionById(extension->id(),
|
| - ExtensionRegistry::ENABLED)) {
|
| + if (!registry()->GetExtensionById(extension->id(),
|
| + ExtensionRegistry::ENABLED)) {
|
| return testing::AssertionFailure() << "Could not install extension.";
|
| }
|
|
|
| @@ -141,8 +141,8 @@ TEST_F(SharedModuleServiceUnitTest, PruneSharedModulesOnUninstall) {
|
| // Since the module was only referenced by that single extension, it should
|
| // have been uninstalled as a side-effect of uninstalling the extension that
|
| // depended upon it.
|
| - EXPECT_FALSE(registry_->GetExtensionById(shared_module->id(),
|
| - ExtensionRegistry::EVERYTHING));
|
| + EXPECT_FALSE(registry()->GetExtensionById(shared_module->id(),
|
| + ExtensionRegistry::EVERYTHING));
|
| }
|
|
|
| TEST_F(SharedModuleServiceUnitTest, WhitelistedImports) {
|
|
|