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

Unified Diff: chrome/browser/ui/toolbar/browser_actions_bar_browsertest.cc

Issue 2839373003: struct UnloadedExtensionInfo -> enum UnloadedExtensionInfoReason (Closed)
Patch Set: Rebase Created 3 years, 8 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/ui/toolbar/browser_actions_bar_browsertest.cc
diff --git a/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.cc b/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.cc
index 9ea5488dd5b01cee97bfa08770fc3e6c5a4c7e50..992e89f302587b1ccd74a38d37eb120f10cbba1a 100644
--- a/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.cc
+++ b/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.cc
@@ -525,8 +525,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest,
content::NotificationService::AllSources());
// Remove the extension. Nothing should crash.
extension_service()->UnloadExtension(
- extension->id(),
- extensions::UnloadedExtensionInfo::REASON_UNINSTALL);
+ extension->id(), extensions::UnloadedExtensionReason::UNINSTALL);
observer.Wait();
}
@@ -593,7 +592,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest, RemovePoppedOutAction) {
// Remove extension 2 - there should still be one left in the overflow
// (extension 2) and one left on the main bar (extension 1).
extension_service()->UnloadExtension(
- extension3->id(), extensions::UnloadedExtensionInfo::REASON_DISABLE);
+ extension3->id(), extensions::UnloadedExtensionReason::DISABLE);
EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions());
EXPECT_EQ(2, browser_actions_bar()->NumberOfBrowserActions());
EXPECT_FALSE(toolbar_actions_bar->popped_out_action());
@@ -615,7 +614,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest, RemovePoppedOutAction) {
// Remove extension 2 - the remaining two should both be overflowed.
extension_service()->UnloadExtension(
- extension2->id(), extensions::UnloadedExtensionInfo::REASON_DISABLE);
+ extension2->id(), extensions::UnloadedExtensionReason::DISABLE);
EXPECT_EQ(0, browser_actions_bar()->VisibleBrowserActions());
EXPECT_EQ(2, browser_actions_bar()->NumberOfBrowserActions());
EXPECT_FALSE(toolbar_actions_bar->popped_out_action());
@@ -632,7 +631,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest, RemovePoppedOutAction) {
EXPECT_EQ(extension3->id(),
toolbar_actions_bar->popped_out_action()->GetId());
extension_service()->UnloadExtension(
- extension3->id(), extensions::UnloadedExtensionInfo::REASON_DISABLE);
+ extension3->id(), extensions::UnloadedExtensionReason::DISABLE);
EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions());
EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions());
EXPECT_FALSE(toolbar_actions_bar->popped_out_action());
« no previous file with comments | « chrome/browser/ui/location_bar/location_bar.cc ('k') | chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698