| Index: chrome/browser/background/background_application_list_model_unittest.cc
|
| diff --git a/chrome/browser/background/background_application_list_model_unittest.cc b/chrome/browser/background/background_application_list_model_unittest.cc
|
| index 4024fad6dfd1b2d4d767d00eaf494c7ee24ca983..47992efc9fdd9ba56da40305112c9bd3e84452e9 100644
|
| --- a/chrome/browser/background/background_application_list_model_unittest.cc
|
| +++ b/chrome/browser/background/background_application_list_model_unittest.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -17,6 +17,7 @@
|
| #include "base/stl_util.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/extensions/extension_service_unittest.h"
|
| +#include "chrome/browser/extensions/permissions_updater.h"
|
| #include "chrome/common/extensions/extension.h"
|
| #include "chrome/test/base/testing_profile.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| @@ -88,14 +89,14 @@ void AddBackgroundPermission(ExtensionService* service,
|
| CreateExtension(GenerateUniqueExtensionName(), true);
|
| scoped_refptr<const ExtensionPermissionSet> permissions =
|
| temporary->GetActivePermissions();
|
| - ExtensionPermissionsManager(service).AddPermissions(
|
| + extensions::PermissionsUpdater(service->profile()).AddPermissions(
|
| extension, permissions.get());
|
| }
|
|
|
| void RemoveBackgroundPermission(ExtensionService* service,
|
| Extension* extension) {
|
| if (!BackgroundApplicationListModel::IsBackgroundApp(*extension)) return;
|
| - ExtensionPermissionsManager(service).RemovePermissions(
|
| + extensions::PermissionsUpdater(service->profile()).RemovePermissions(
|
| extension, extension->GetActivePermissions());
|
| }
|
| } // namespace
|
| @@ -268,10 +269,10 @@ void RemoveExtension(ExtensionService* service,
|
| }
|
|
|
| void TogglePermission(ExtensionService* service,
|
| - ExtensionCollection* extensions,
|
| - BackgroundApplicationListModel* model,
|
| - size_t* expected,
|
| - size_t* count) {
|
| + ExtensionCollection* extensions,
|
| + BackgroundApplicationListModel* model,
|
| + size_t* expected,
|
| + size_t* count) {
|
| ExtensionCollection::iterator cursor = extensions->begin();
|
| if (cursor == extensions->end()) {
|
| // Nothing to toggle. Just verify accounting.
|
|
|