Moved some functions off ExtensionService into a new file extension_util.

chrome/browser/extensions/extension_functional_browsertest.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/chrome_notification_types.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 
 namespace extensions {
 
 class ExtensionFunctionalTest : public ExtensionBrowserTest {
 public:
   void InstallExtensionSilently(ExtensionService* service,
@@ skipping 39 matching lines @@
                        PRE_TestAdblockExtensionCrash) {
   ExtensionService* service = profile()->GetExtensionService();
   InstallExtensionSilently(service, "adblock.crx");
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionFunctionalTest, TestAdblockExtensionCrash) {
   ExtensionService* service = profile()->GetExtensionService();
   // Verify that the extension is enabled and allowed in incognito
   // is disabled.
   EXPECT_TRUE(service->IsExtensionEnabled(last_loaded_extension_id_));
-  EXPECT_FALSE(service->IsIncognitoEnabled(last_loaded_extension_id_));
+  EXPECT_FALSE(extension_util::IsIncognitoEnabled(last_loaded_extension_id_,
+                                                  service));
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionFunctionalTest, TestSetExtensionsState) {
   ExtensionService* service = profile()->GetExtensionService();
   InstallExtensionSilently(service, "google_talk.crx");
 
   // Disable the extension and verify.
-  service->SetIsIncognitoEnabled(last_loaded_extension_id_, false);
+  extension_util::SetIsIncognitoEnabled(
+      last_loaded_extension_id_, service, false);
   service->DisableExtension(last_loaded_extension_id_,
                             Extension::DISABLE_USER_ACTION);
   EXPECT_FALSE(service->IsExtensionEnabled(last_loaded_extension_id_));
 
   // Enable the extension and verify.
-  service->SetIsIncognitoEnabled(last_loaded_extension_id_, false);
+  extension_util::SetIsIncognitoEnabled(
+      last_loaded_extension_id_, service, false);
   service->EnableExtension(last_loaded_extension_id_);
   EXPECT_TRUE(service->IsExtensionEnabled(last_loaded_extension_id_));
 
   // Allow extension in incognito mode and verify.
   service->EnableExtension(last_loaded_extension_id_);
-  service->SetIsIncognitoEnabled(last_loaded_extension_id_, true);
-  EXPECT_TRUE(service->IsIncognitoEnabled(last_loaded_extension_id_));
+  extension_util::SetIsIncognitoEnabled(
+      last_loaded_extension_id_, service, true);
+  EXPECT_TRUE(extension_util::IsIncognitoEnabled(last_loaded_extension_id_,
+                                                 service));
 
   // Disallow extension in incognito mode and verify.
   service->EnableExtension(last_loaded_extension_id_);
-  service->SetIsIncognitoEnabled(last_loaded_extension_id_, false);
-  EXPECT_FALSE(service->IsIncognitoEnabled(last_loaded_extension_id_));
+  extension_util::SetIsIncognitoEnabled(
+      last_loaded_extension_id_, service, false);
+  EXPECT_FALSE(extension_util::IsIncognitoEnabled(last_loaded_extension_id_,
+                                                  service));
 }
 }  // namespace extensions