Remove ExtensionService::extension_prefs()

chrome/browser/extensions/api/permissions/permissions_apitest.cc

 // 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.
 
 #include "chrome/browser/extensions/api/permissions/permissions_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
-#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/common/permissions/permission_set.h"
 #include "extensions/common/switches.h"
 #include "net/dns/mock_host_resolver.h"
 
 namespace extensions {
 
 namespace {
@@ skipping 54 matching lines @@
   // Mark all the tested APIs as granted to bypass the confirmation UI.
   APIPermissionSet apis;
   apis.insert(APIPermission::kBookmark);
   ManifestPermissionSet manifest_permissions;
   URLPatternSet explicit_hosts;
   AddPattern(&explicit_hosts, "http://*.c.com/*");
   scoped_refptr<PermissionSet> granted_permissions =
       new PermissionSet(apis, manifest_permissions,
                         explicit_hosts, URLPatternSet());
 
-  ExtensionPrefs* prefs =
-      browser()->profile()->GetExtensionService()->extension_prefs();
+  ExtensionPrefs* prefs = ExtensionPrefs::Get(browser()->profile());
   prefs->AddGrantedPermissions("kjmkgkdkpedkejedfhmfcenooemhbpbo",
                                granted_permissions.get());
 
   PermissionsRequestFunction::SetIgnoreUserGestureForTests(true);
   host_resolver()->AddRule("*.com", "127.0.0.1");
   ASSERT_TRUE(StartEmbeddedTestServer());
   EXPECT_TRUE(RunExtensionTest("permissions/optional")) << message_;
 }
 
 // Tests that the optional permissions API works correctly.
@@ skipping 25 matching lines @@
   EXPECT_TRUE(RunExtensionTest("permissions/optional_gesture")) << message_;
 }
 
 // Tests that an extension can't gain access to file: URLs without the checkbox
 // entry in prefs. There shouldn't be a warning either.
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OptionalPermissionsFileAccess) {
   // There shouldn't be a warning, so we shouldn't need to autoconfirm.
   PermissionsRequestFunction::SetAutoConfirmForTests(false);
   PermissionsRequestFunction::SetIgnoreUserGestureForTests(true);
 
-  ExtensionPrefs* prefs =
-      browser()->profile()->GetExtensionService()->extension_prefs();
+  ExtensionPrefs* prefs = ExtensionPrefs::Get(browser()->profile());
 
   EXPECT_TRUE(
       RunExtensionTestNoFileAccess("permissions/file_access_no")) << message_;
   EXPECT_FALSE(prefs->AllowFileAccess("dgloelfbnddbdacakahpogklfdcccbib"));
 
   EXPECT_TRUE(RunExtensionTest("permissions/file_access_yes")) << message_;
   // TODO(kalman): ugh, it would be nice to test this condition, but it seems
   // like there's somehow a race here where the prefs aren't updated in time
   // with the "allow file access" bit, so we'll just have to trust that
   // RunExtensionTest (unlike RunExtensionTestNoFileAccess) does indeed
   // not set the allow file access bit. Otherwise this test doesn't mean
   // a whole lot (i.e. file access works - but it'd better not be the case
   // that the extension actually has file access, since that'd be the bug
   // that this is supposed to be testing).
   //EXPECT_TRUE(prefs->AllowFileAccess("hlonmbgfjccgolnaboonlakjckinmhmd"));
 }
 
 // Test requesting, querying, and removing host permissions for host
 // permissions that are a subset of the optional permissions.
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, HostSubsets) {
   PermissionsRequestFunction::SetAutoConfirmForTests(true);
   PermissionsRequestFunction::SetIgnoreUserGestureForTests(true);
   EXPECT_TRUE(RunExtensionTest("permissions/host_subsets")) << message_;
 }
 
 }  // namespace extensions