| Index: chrome/browser/supervised_user/supervised_user_service_unittest.cc
|
| diff --git a/chrome/browser/supervised_user/supervised_user_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_service_unittest.cc
|
| index bc4811c4ac319f865ec23ed11c45100f33b21c7c..4fdff5fbaf44ec971b1b3f676e93dfbf1dc651c6 100644
|
| --- a/chrome/browser/supervised_user/supervised_user_service_unittest.cc
|
| +++ b/chrome/browser/supervised_user/supervised_user_service_unittest.cc
|
| @@ -25,6 +25,7 @@
|
| #include "chrome/test/base/testing_profile.h"
|
| #include "content/public/test/test_browser_thread_bundle.h"
|
| #include "content/public/test/test_utils.h"
|
| +#include "extensions/browser/install_flag.h"
|
| #include "extensions/common/extension.h"
|
| #include "extensions/common/extension_builder.h"
|
| #include "extensions/common/manifest_constants.h"
|
| @@ -238,7 +239,8 @@ TEST_F(SupervisedUserServiceExtensionTestUnsupervised,
|
|
|
| scoped_refptr<extensions::Extension> extension = MakeExtension();
|
| base::string16 error_1;
|
| - EXPECT_TRUE(supervised_user_service->UserMayLoad(extension.get(), &error_1));
|
| + EXPECT_TRUE(supervised_user_service->UserMayLoad(
|
| + extension.get(), extensions::kInstallFlagNone, &error_1));
|
| EXPECT_EQ(base::string16(), error_1);
|
|
|
| base::string16 error_2;
|
| @@ -260,7 +262,8 @@ TEST_F(SupervisedUserServiceExtensionTest, ExtensionManagementPolicyProvider) {
|
| // Check that a supervised user can install a theme.
|
| scoped_refptr<extensions::Extension> theme = MakeThemeExtension();
|
| base::string16 error_1;
|
| - EXPECT_TRUE(supervised_user_service->UserMayLoad(theme.get(), &error_1));
|
| + EXPECT_TRUE(supervised_user_service->UserMayLoad(
|
| + theme.get(), extensions::kInstallFlagNone, &error_1));
|
| EXPECT_TRUE(error_1.empty());
|
| EXPECT_TRUE(
|
| supervised_user_service->UserMayModifySettings(theme.get(), &error_1));
|
| @@ -268,7 +271,8 @@ TEST_F(SupervisedUserServiceExtensionTest, ExtensionManagementPolicyProvider) {
|
|
|
| // Now check a different kind of extension.
|
| scoped_refptr<extensions::Extension> extension = MakeExtension();
|
| - EXPECT_FALSE(supervised_user_service->UserMayLoad(extension.get(), &error_1));
|
| + EXPECT_FALSE(supervised_user_service->UserMayLoad(
|
| + extension.get(), extensions::kInstallFlagNone, &error_1));
|
| EXPECT_FALSE(error_1.empty());
|
|
|
| base::string16 error_2;
|
|
|