Cleanup extension permissions module.

chrome/browser/background/background_application_list_model_unittest.cc

-// 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.
 
 // TODO(rickcam): Bug 73183: Add unit tests for image loading
 
 #include <cstdlib>
 #include <set>
 
 #include "chrome/browser/background/background_application_list_model.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #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"
 #include "content/public/browser/notification_types.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // This value is used to seed the PRNG at the beginning of a sequence of
 // operations to produce a repeatable sequence.
 #define RANDOM_SEED (0x33F7A7A7)
@@ skipping 51 matching lines @@
 }
 
 void AddBackgroundPermission(ExtensionService* service,
                              Extension* extension) {
   if (BackgroundApplicationListModel::IsBackgroundApp(*extension)) return;
 
   static scoped_refptr<Extension> temporary =
       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
 
 // With minimal test logic, verifies behavior over an explicit set of
 // extensions, of which some are Background Apps and others are not.
 TEST_F(BackgroundApplicationListModelTest, ExplicitTest) {
   InitializeAndLoadEmptyExtensionService();
   ExtensionService* service = profile_->GetExtensionService();
   ASSERT_TRUE(service);
@@ skipping 152 matching lines @@
     extensions->erase(cursor);
     --*count;
     ASSERT_EQ(*count, extensions->size());
     service->UninstallExtension(extension->id(), false, NULL);
     ASSERT_EQ(*count, service->extensions()->size());
     ASSERT_EQ(*expected, model->size());
   }
 }
 
 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.
     ASSERT_EQ(0U, *count);
     ASSERT_EQ(0U, *expected);
     ASSERT_EQ(0U, service->extensions()->size());
     ASSERT_EQ(0U, model->size());
   } else {
     // Randomly select which extension to toggle.
     if (extensions->size() > 1) {
@@ skipping 48 matching lines @@
         break;
       case 2:
         TogglePermission(service, &extensions, model.get(), &expected, &count);
         break;
       default:
         NOTREACHED();
         break;
     }
   }
 }