Remove GetExtensionService from Profile.

chrome/browser/extensions/settings/settings_frontend_unittest.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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 76 matching lines @@
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 };
 
 // Get a semblance of coverage for both extension and app settings by
 // alternating in each test.
 // TODO(kalman): explicitly test the two interact correctly.
 
 TEST_F(ExtensionSettingsFrontendTest, SettingsPreservedAcrossReconstruction) {
   const std::string id = "ext";
-  profile_->GetMockExtensionService()->AddExtensionWithId(
-      id, Extension::TYPE_EXTENSION);
+  ExtensionServiceInterface* esi = static_cast<ExtensionServiceInterface*>(

[Yoyo Zhou, 2012/11/21 00:27:13]

I don't think you need this static_cast (here and below).

[Miranda Callahan, 2012/11/26 22:14:24]

Done.

+      extensions::ExtensionSystem::Get(profile_.get())->extension_service());
+  static_cast<extensions::settings_test_util::MockExtensionService*>(esi)->
+      AddExtensionWithId(id, Extension::TYPE_EXTENSION);
 
   ValueStore* storage = util::GetStorage(id, frontend_.get());
 
   // The correctness of Get/Set/Remove/Clear is tested elsewhere so no need to
   // be too rigorous.
   {
     StringValue bar("bar");
     ValueStore::WriteResult result = storage->Set(DEFAULTS, "foo", bar);
     ASSERT_FALSE(result->HasError());
   }
 
   {
     ValueStore::ReadResult result = storage->Get();
     ASSERT_FALSE(result->HasError());
     EXPECT_FALSE(result->settings()->empty());
   }
 
   ResetFrontend();
   storage = util::GetStorage(id, frontend_.get());
 
   {
     ValueStore::ReadResult result = storage->Get();
     ASSERT_FALSE(result->HasError());
     EXPECT_FALSE(result->settings()->empty());
   }
 }
 
 TEST_F(ExtensionSettingsFrontendTest, SettingsClearedOnUninstall) {
   const std::string id = "ext";
-  profile_->GetMockExtensionService()->AddExtensionWithId(
-      id, Extension::TYPE_LEGACY_PACKAGED_APP);
+  ExtensionServiceInterface* esi = static_cast<ExtensionServiceInterface*>(
+      extensions::ExtensionSystem::Get(profile_.get())->extension_service());
+  static_cast<extensions::settings_test_util::MockExtensionService*>(esi)->
+      AddExtensionWithId(id, Extension::TYPE_LEGACY_PACKAGED_APP);
 
   ValueStore* storage = util::GetStorage(id, frontend_.get());
 
   {
     StringValue bar("bar");
     ValueStore::WriteResult result = storage->Set(DEFAULTS, "foo", bar);
     ASSERT_FALSE(result->HasError());
   }
 
   // This would be triggered by extension uninstall via a DataDeleter.
   frontend_->DeleteStorageSoon(id);
   MessageLoop::current()->RunUntilIdle();
 
   // The storage area may no longer be valid post-uninstall, so re-request.
   storage = util::GetStorage(id, frontend_.get());
   {
     ValueStore::ReadResult result = storage->Get();
     ASSERT_FALSE(result->HasError());
     EXPECT_TRUE(result->settings()->empty());
   }
 }
 
 TEST_F(ExtensionSettingsFrontendTest, LeveldbDatabaseDeletedFromDiskOnClear) {
   const std::string id = "ext";
-  profile_->GetMockExtensionService()->AddExtensionWithId(
-      id, Extension::TYPE_EXTENSION);
+  ExtensionServiceInterface* esi = static_cast<ExtensionServiceInterface*>(
+      extensions::ExtensionSystem::Get(profile_.get())->extension_service());
+  static_cast<extensions::settings_test_util::MockExtensionService*>(esi)->
+      AddExtensionWithId(id, Extension::TYPE_EXTENSION);
 
   ValueStore* storage = util::GetStorage(id, frontend_.get());
 
   {
     StringValue bar("bar");
     ValueStore::WriteResult result = storage->Set(DEFAULTS, "foo", bar);
     ASSERT_FALSE(result->HasError());
     EXPECT_TRUE(file_util::PathExists(temp_dir_.path()));
   }
 
@@ skipping 14 matching lines @@
 }
 
 #if defined(OS_WIN)
 // Failing on vista dbg. http://crbug.com/111100, http://crbug.com/108724
 #define QuotaLimitsEnforcedCorrectlyForSyncAndLocal \
   DISABLED_QuotaLimitsEnforcedCorrectlyForSyncAndLocal
 #endif
 TEST_F(ExtensionSettingsFrontendTest,
        QuotaLimitsEnforcedCorrectlyForSyncAndLocal) {
   const std::string id = "ext";
-  profile_->GetMockExtensionService()->AddExtensionWithId(
-      id, Extension::TYPE_EXTENSION);
+  ExtensionServiceInterface* esi = static_cast<ExtensionServiceInterface*>(
+      extensions::ExtensionSystem::Get(profile_.get())->extension_service());
+  static_cast<extensions::settings_test_util::MockExtensionService*>(esi)->
+      AddExtensionWithId(id, Extension::TYPE_EXTENSION);
 
   ValueStore* sync_storage =
       util::GetStorage(id, settings::SYNC, frontend_.get());
   ValueStore* local_storage =
       util::GetStorage(id, settings::LOCAL, frontend_.get());
 
   // Sync storage should run out after ~100K.
   scoped_ptr<Value> kilobyte = CreateKilobyte();
   for (int i = 0; i < 100; ++i) {
     sync_storage->Set(
@@ skipping 55 matching lines @@
 
 #if defined(OS_WIN)
 // Failing on vista dbg. http://crbug.com/111100, http://crbug.com/108724
 #define UnlimitedStorageForLocalButNotSync DISABLED_UnlimitedStorageForLocalButNotSync
 #endif
 TEST_F(ExtensionSettingsFrontendTest,
        UnlimitedStorageForLocalButNotSync) {
   const std::string id = "ext";
   std::set<std::string> permissions;
   permissions.insert("unlimitedStorage");
-  profile_->GetMockExtensionService()->AddExtensionWithIdAndPermissions(
-      id, Extension::TYPE_EXTENSION, permissions);
+  ExtensionServiceInterface* esi = static_cast<ExtensionServiceInterface*>(
+      extensions::ExtensionSystem::Get(profile_.get())->extension_service());
+  static_cast<extensions::settings_test_util::MockExtensionService*>(esi)->
+      AddExtensionWithIdAndPermissions(id, Extension::TYPE_EXTENSION,
+                                       permissions);
 
   frontend_->RunWithStorage(
       id, settings::SYNC, base::Bind(&UnlimitedSyncStorageTestCallback));
   frontend_->RunWithStorage(
       id, settings::LOCAL, base::Bind(&UnlimitedLocalStorageTestCallback));
 
   MessageLoop::current()->RunUntilIdle();
 }
 
 }  // namespace extensions