Index: chrome/browser/background/background_application_list_model_unittest.cc |
diff --git a/chrome/browser/background/background_application_list_model_unittest.cc b/chrome/browser/background/background_application_list_model_unittest.cc |
index a8c817942175bad9553120e77c7882b0c8544e9b..37ab7fd330f9681c763b4f2245d21d6250e5a830 100644 |
--- a/chrome/browser/background/background_application_list_model_unittest.cc |
+++ b/chrome/browser/background/background_application_list_model_unittest.cc |
@@ -34,6 +34,7 @@ |
using extensions::APIPermission; |
using extensions::Extension; |
+using extensions::UninstalledExtensionInfo; |
// For ExtensionService interface when it requires a path that is not used. |
base::FilePath bogus_file_pathname(const std::string& name) { |
@@ -212,27 +213,27 @@ TEST_F(BackgroundApplicationListModelTest, MAYBE_ExplicitTest) { |
// Remove in FIFO order. |
ASSERT_FALSE(IsBackgroundApp(*ext1.get())); |
service->UninstallExtension( |
- ext1->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL); |
+ ext1->id(), UninstalledExtensionInfo::REASON_FOR_TESTING, NULL); |
ASSERT_EQ(4U, service->extensions()->size()); |
ASSERT_EQ(2U, model->size()); |
ASSERT_TRUE(IsBackgroundApp(*bgapp1.get())); |
service->UninstallExtension( |
- bgapp1->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL); |
+ bgapp1->id(), UninstalledExtensionInfo::REASON_FOR_TESTING, NULL); |
ASSERT_EQ(3U, service->extensions()->size()); |
ASSERT_EQ(1U, model->size()); |
ASSERT_FALSE(IsBackgroundApp(*ext2.get())); |
service->UninstallExtension( |
- ext2->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL); |
+ ext2->id(), UninstalledExtensionInfo::REASON_FOR_TESTING, NULL); |
ASSERT_EQ(2U, service->extensions()->size()); |
ASSERT_EQ(1U, model->size()); |
ASSERT_TRUE(IsBackgroundApp(*bgapp2.get())); |
service->UninstallExtension( |
- bgapp2->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL); |
+ bgapp2->id(), UninstalledExtensionInfo::REASON_FOR_TESTING, NULL); |
ASSERT_EQ(1U, service->extensions()->size()); |
ASSERT_EQ(0U, model->size()); |
ASSERT_FALSE(IsBackgroundApp(*ext3.get())); |
service->UninstallExtension( |
- ext3->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL); |
+ ext3->id(), UninstalledExtensionInfo::REASON_FOR_TESTING, NULL); |
ASSERT_EQ(0U, service->extensions()->size()); |
ASSERT_EQ(0U, model->size()); |
} |
@@ -284,7 +285,7 @@ TEST_F(BackgroundApplicationListModelTest, PushMessagingTest) { |
// Need to remove ext2 because it uses same id as bgapp3. |
ASSERT_FALSE(IsBackgroundApp(*ext2.get())); |
service->UninstallExtension( |
- ext2->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL); |
+ ext2->id(), UninstalledExtensionInfo::REASON_FOR_TESTING, NULL); |
ASSERT_EQ(3U, service->extensions()->size()); |
ASSERT_EQ(2U, model->size()); |
ASSERT_TRUE(IsBackgroundApp(*bgapp3.get())); |
@@ -295,22 +296,22 @@ TEST_F(BackgroundApplicationListModelTest, PushMessagingTest) { |
// Remove in FIFO order. |
ASSERT_FALSE(IsBackgroundApp(*ext1.get())); |
service->UninstallExtension( |
- ext1->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL); |
+ ext1->id(), UninstalledExtensionInfo::REASON_FOR_TESTING, NULL); |
ASSERT_EQ(3U, service->extensions()->size()); |
ASSERT_EQ(3U, model->size()); |
ASSERT_TRUE(IsBackgroundApp(*bgapp1.get())); |
service->UninstallExtension( |
- bgapp1->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL); |
+ bgapp1->id(), UninstalledExtensionInfo::REASON_FOR_TESTING, NULL); |
ASSERT_EQ(2U, service->extensions()->size()); |
ASSERT_EQ(2U, model->size()); |
ASSERT_TRUE(IsBackgroundApp(*bgapp2.get())); |
service->UninstallExtension( |
- bgapp2->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL); |
+ bgapp2->id(), UninstalledExtensionInfo::REASON_FOR_TESTING, NULL); |
ASSERT_EQ(1U, service->extensions()->size()); |
ASSERT_EQ(1U, model->size()); |
ASSERT_TRUE(IsBackgroundApp(*bgapp3.get())); |
service->UninstallExtension( |
- bgapp3->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL); |
+ bgapp3->id(), UninstalledExtensionInfo::REASON_FOR_TESTING, NULL); |
ASSERT_EQ(0U, service->extensions()->size()); |
ASSERT_EQ(0U, model->size()); |
} |
@@ -428,7 +429,7 @@ void RemoveExtension(ExtensionService* service, |
--*count; |
ASSERT_EQ(*count, extensions->size()); |
service->UninstallExtension( |
- extension->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL); |
+ extension->id(), UninstalledExtensionInfo::REASON_FOR_TESTING, NULL); |
ASSERT_EQ(*count, service->extensions()->size()); |
ASSERT_EQ(*expected, model->size()); |
} |