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

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

Issue 10682007: Move PendingExtensionManager and PendingExtensionInfo into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Latest master for cq Created 8 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
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/browser/extensions/pending_extension_info.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b31244a01a661381b6563288727f2c66a7961b2c..a12bded1c765e49019107facd5bd4058cef41011 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -2503,7 +2503,7 @@ TEST_F(ExtensionServiceTest, AddPendingExtensionFromSync) {
kFakeId, kFakeUpdateURL, &IsExtension,
kFakeInstallSilently));
- const PendingExtensionInfo* pending_extension_info;
+ const extensions::PendingExtensionInfo* pending_extension_info;
ASSERT_TRUE((pending_extension_info = service_->pending_extension_manager()->
GetById(kFakeId)));
EXPECT_EQ(kFakeUpdateURL, pending_extension_info->update_url());
@@ -2606,7 +2606,7 @@ TEST_F(ExtensionServiceTest, UpdatePendingExternalCrxWinsOverSync) {
kGoodInstallSilently));
// Check that there is a pending crx, with is_from_sync set to true.
- const PendingExtensionInfo* pending_extension_info;
+ const extensions::PendingExtensionInfo* pending_extension_info;
ASSERT_TRUE((pending_extension_info = service_->pending_extension_manager()->
GetById(kGoodId)));
EXPECT_TRUE(pending_extension_info->is_from_sync());
@@ -4771,7 +4771,7 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataNotInstalled) {
EXPECT_FALSE(service_->IsExtensionEnabled(good_crx));
EXPECT_TRUE(service_->IsIncognitoEnabled(good_crx));
- const PendingExtensionInfo* info;
+ const extensions::PendingExtensionInfo* info;
EXPECT_TRUE((info = service_->pending_extension_manager()->
GetById(good_crx)));
EXPECT_EQ(ext_specifics->update_url(), info->update_url().spec());
@@ -4790,7 +4790,8 @@ TEST_F(ExtensionServiceTest, InstallPriorityExternalUpdateUrl) {
ValidateIntegerPref(good_crx, "state", Extension::ENABLED);
ValidateIntegerPref(good_crx, "location", Extension::INTERNAL);
- PendingExtensionManager* pending = service_->pending_extension_manager();
+ extensions::PendingExtensionManager* pending =
+ service_->pending_extension_manager();
EXPECT_FALSE(pending->IsIdPending(kGoodId));
// Skip install when the location is the same.
@@ -4851,7 +4852,8 @@ TEST_F(ExtensionServiceTest, InstallPriorityExternalLocalFile) {
Extension::GetHigherPriorityLocation(Extension::EXTERNAL_PREF,
Extension::INTERNAL));
- PendingExtensionManager* pending = service_->pending_extension_manager();
+ extensions::PendingExtensionManager* pending =
+ service_->pending_extension_manager();
EXPECT_FALSE(pending->IsIdPending(kGoodId));
// Simulate an external source adding the extension as INTERNAL.
@@ -4989,7 +4991,8 @@ TEST_F(ExtensionServiceTest, ConcurrentExternalLocalFile) {
InitializeEmptyExtensionService();
- PendingExtensionManager* pending = service_->pending_extension_manager();
+ extensions::PendingExtensionManager* pending =
+ service_->pending_extension_manager();
EXPECT_FALSE(pending->IsIdPending(kGoodId));
// An external provider starts installing from a local crx.
@@ -4997,7 +5000,7 @@ TEST_F(ExtensionServiceTest, ConcurrentExternalLocalFile) {
service_->OnExternalExtensionFileFound(
kGoodId, &kVersion123, kInvalidPathToCrx,
Extension::EXTERNAL_PREF, kCreationFlags, kDontMarkAcknowledged));
- const PendingExtensionInfo* info;
+ const extensions::PendingExtensionInfo* info;
EXPECT_TRUE((info = pending->GetById(kGoodId)));
EXPECT_TRUE(info->version().IsValid());
EXPECT_TRUE(info->version().Equals(kVersion123));
@@ -5105,7 +5108,7 @@ class ExtensionSourcePriorityTest : public ExtensionServiceTest {
// Get the install source of a pending extension.
Extension::Location GetPendingLocation() {
- const PendingExtensionInfo* info;
+ const extensions::PendingExtensionInfo* info;
EXPECT_TRUE((info = service_->pending_extension_manager()->
GetById(crx_id_)));
return info->install_source();
@@ -5113,7 +5116,7 @@ class ExtensionSourcePriorityTest : public ExtensionServiceTest {
// Is an extension pending from a sync request?
bool GetPendingIsFromSync() {
- const PendingExtensionInfo* info;
+ const extensions::PendingExtensionInfo* info;
EXPECT_TRUE((info = service_->pending_extension_manager()->
GetById(crx_id_)));
return info->is_from_sync();
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/browser/extensions/pending_extension_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698