| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/extensions/extension_service_unittest.h" | 5 #include "chrome/browser/extensions/extension_service_unittest.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 604 profile_.get(), service_->extension_prefs(), service_)); | 604 profile_.get(), service_->extension_prefs(), service_)); |
| 605 } | 605 } |
| 606 | 606 |
| 607 // static | 607 // static |
| 608 void ExtensionServiceTestBase::SetUpTestCase() { | 608 void ExtensionServiceTestBase::SetUpTestCase() { |
| 609 ExtensionErrorReporter::Init(false); // no noisy errors | 609 ExtensionErrorReporter::Init(false); // no noisy errors |
| 610 } | 610 } |
| 611 | 611 |
| 612 void ExtensionServiceTestBase::SetUp() { | 612 void ExtensionServiceTestBase::SetUp() { |
| 613 ExtensionErrorReporter::GetInstance()->ClearErrors(); | 613 ExtensionErrorReporter::GetInstance()->ClearErrors(); |
| 614 content::RenderProcessHost::SetRunRendererInProcess(true); | |
| 615 } | 614 } |
| 616 | 615 |
| 617 void ExtensionServiceTestBase::TearDown() { | 616 void ExtensionServiceTestBase::TearDown() { |
| 618 content::RenderProcessHost::SetRunRendererInProcess(false); | |
| 619 } | 617 } |
| 620 | 618 |
| 621 ExtensionServiceTestBase::ExtensionServiceInitParams | 619 ExtensionServiceTestBase::ExtensionServiceInitParams |
| 622 ExtensionServiceTestBase::CreateDefaultInitParams() { | 620 ExtensionServiceTestBase::CreateDefaultInitParams() { |
| 623 return CreateDefaultInitParamsInTempDir(&temp_dir_); | 621 return CreateDefaultInitParamsInTempDir(&temp_dir_); |
| 624 } | 622 } |
| 625 | 623 |
| 626 // static | 624 // static |
| 627 ExtensionServiceTestBase::ExtensionServiceInitParams | 625 ExtensionServiceTestBase::ExtensionServiceInitParams |
| 628 ExtensionServiceTestBase::CreateDefaultInitParamsInTempDir( | 626 ExtensionServiceTestBase::CreateDefaultInitParamsInTempDir( |
| (...skipping 6151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6780 // ReconcileKnownDisabled(). | 6778 // ReconcileKnownDisabled(). |
| 6781 service_->EnableExtension(good2); | 6779 service_->EnableExtension(good2); |
| 6782 service_->ReconcileKnownDisabled(); | 6780 service_->ReconcileKnownDisabled(); |
| 6783 expected_extensions.insert(good2); | 6781 expected_extensions.insert(good2); |
| 6784 expected_disabled_extensions.erase(good2); | 6782 expected_disabled_extensions.erase(good2); |
| 6785 | 6783 |
| 6786 EXPECT_EQ(expected_extensions, service_->extensions()->GetIDs()); | 6784 EXPECT_EQ(expected_extensions, service_->extensions()->GetIDs()); |
| 6787 EXPECT_EQ(expected_disabled_extensions, | 6785 EXPECT_EQ(expected_disabled_extensions, |
| 6788 service_->disabled_extensions()->GetIDs()); | 6786 service_->disabled_extensions()->GetIDs()); |
| 6789 } | 6787 } |
| OLD | NEW |