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

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

Issue 2409443002: Make GlobalErrorService's ownership model slightly less insane. (Closed)
Patch Set: windows, ownership Created 4 years, 2 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/app_menu_model_unittest.cc
diff --git a/chrome/browser/ui/toolbar/app_menu_model_unittest.cc b/chrome/browser/ui/toolbar/app_menu_model_unittest.cc
index b01e4e3b309d14a4cc652add4804df3ab20a6e68..a4d7bc2e917755c8a5f602b74b2dbaeacc8aea75 100644
--- a/chrome/browser/ui/toolbar/app_menu_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model_unittest.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/ui/toolbar/app_menu_model.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/defaults.h"
#include "chrome/browser/prefs/browser_prefs.h"
@@ -179,13 +180,11 @@ TEST_F(AppMenuModelTest, GlobalError) {
GlobalErrorServiceFactory::GetForProfile(browser()->profile());
ProfileOAuth2TokenServiceFactory::GetForProfile(browser()->profile());
const int command1 = 1234567;
- // AddGlobalError takes ownership of error1.
MenuError* error1 = new MenuError(command1);
- service->AddGlobalError(error1);
+ service->AddOwnedGlobalError(base::WrapUnique(error1));
const int command2 = 1234568;
- // AddGlobalError takes ownership of error2.
MenuError* error2 = new MenuError(command2);
- service->AddGlobalError(error2);
+ service->AddOwnedGlobalError(base::WrapUnique(error2));
AppMenuModel model(this, browser());
int index1 = model.GetIndexOfCommandId(command1);

Powered by Google App Engine
This is Rietveld 408576698