Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4521)

Unified Diff: chrome/browser/extensions/extension_service_unittest.cc

Issue 17127002: Correctly integrate StoragePartition into TestingProfile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix InstantNTP test. Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_service_unittest.cc
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 580e728629d9af80fcae186e1b06704b1ae4ac97..e8f452b98cd7b8620428c98f007c2e24424ace7f 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -578,13 +578,6 @@ void ExtensionServiceTestBase::InitializeExtensionServiceHelper(
InitializeExtensionService(params);
}
-void ExtensionServiceTestBase::InitializeRequestContext() {
- ASSERT_TRUE(profile_.get());
- TestingProfile* profile =
- static_cast<TestingProfile*>(profile_.get());
- profile->CreateRequestContext();
-}
-
// static
void ExtensionServiceTestBase::SetUpTestCase() {
ExtensionErrorReporter::Init(false); // no noisy errors
@@ -1974,7 +1967,6 @@ TEST_F(ExtensionServiceTest, GrantedPermissions) {
// default apps.
TEST_F(ExtensionServiceTest, DefaultAppsGrantedPermissions) {
InitializeEmptyExtensionService();
- InitializeRequestContext();
base::FilePath path = data_dir_
.AppendASCII("permissions");
@@ -2607,7 +2599,6 @@ TEST_F(ExtensionServiceTest, EnsureCWSOrdinalsInitialized) {
TEST_F(ExtensionServiceTest, InstallAppsWithUnlimitedStorage) {
InitializeEmptyExtensionService();
- InitializeRequestContext();
EXPECT_TRUE(service_->extensions()->is_empty());
int pref_count = 0;
@@ -2659,7 +2650,6 @@ TEST_F(ExtensionServiceTest, InstallAppsWithUnlimitedStorage) {
TEST_F(ExtensionServiceTest, InstallAppsAndCheckStorageProtection) {
InitializeEmptyExtensionService();
- InitializeRequestContext();
EXPECT_TRUE(service_->extensions()->is_empty());
int pref_count = 0;
@@ -3744,7 +3734,6 @@ TEST_F(ExtensionServiceTest, ExternalExtensionAutoAcknowledgement) {
// This tests if default apps are installed correctly.
TEST_F(ExtensionServiceTest, DefaultAppsInstall) {
InitializeEmptyExtensionService();
- InitializeRequestContext();
set_extensions_enabled(true);
{
@@ -3853,7 +3842,6 @@ TEST_F(ExtensionServiceTest, DisableAllExtensions) {
// Tests reloading extensions.
TEST_F(ExtensionServiceTest, ReloadExtensions) {
InitializeEmptyExtensionService();
- InitializeRequestContext();
// Simple extension that should install without error.
base::FilePath path = data_dir_.AppendASCII("good.crx");
@@ -4184,7 +4172,6 @@ TEST_F(ExtensionServiceTest, ClearExtensionData) {
// Verifies app state is removed upon uninstall.
TEST_F(ExtensionServiceTest, ClearAppData) {
InitializeEmptyExtensionService();
- InitializeRequestContext();
ExtensionCookieCallback callback;
int pref_count = 0;
@@ -5641,7 +5628,6 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataTerminatedExtension) {
TEST_F(ExtensionServiceTest, ProcessSyncDataVersionCheck) {
InitializeExtensionServiceWithUpdater();
- InitializeRequestContext();
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
@@ -5709,7 +5695,6 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataVersionCheck) {
TEST_F(ExtensionServiceTest, ProcessSyncDataNotInstalled) {
InitializeExtensionServiceWithUpdater();
- InitializeRequestContext();
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),

Powered by Google App Engine
This is Rietveld 408576698