Make GlobalErrorService's ownership model slightly less insane.

chrome/browser/ui/toolbar/app_menu_model_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/upgrade_detector.h"
@@ skipping 154 matching lines @@
   EXPECT_EQ(model.enable_count_, 1);
 }
 
 // Tests global error menu items in the app menu.
 TEST_F(AppMenuModelTest, GlobalError) {
   // Make sure services required for tests are initialized.
   GlobalErrorService* service =
       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->AddGlobalError(base::WrapUnique(error1));
   const int command2 = 1234568;
-  // AddGlobalError takes ownership of error2.
   MenuError* error2 = new MenuError(command2);
-  service->AddGlobalError(error2);
+  service->AddGlobalError(base::WrapUnique(error2));
 
   AppMenuModel model(this, browser());
   int index1 = model.GetIndexOfCommandId(command1);
   EXPECT_GT(index1, -1);
   int index2 = model.GetIndexOfCommandId(command2);
   EXPECT_GT(index2, -1);
 
   EXPECT_TRUE(model.IsEnabledAt(index1));
   EXPECT_EQ(0, error1->execute_count());
   model.ActivatedAt(index1);
   EXPECT_EQ(1, error1->execute_count());
 
   EXPECT_TRUE(model.IsEnabledAt(index2));
   EXPECT_EQ(0, error2->execute_count());
   model.ActivatedAt(index2);
   EXPECT_EQ(1, error1->execute_count());
 }