[Cleanup] Used scoped pointers in KeyedServiceFactory's SetTestingFactory functions.

chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc

 // Copyright 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/recent_tabs_sub_menu_model.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/sessions/persistent_tab_restore_service.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/sync/glue/synced_session.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "chrome/browser/sync/sessions/sessions_sync_manager.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 112 matching lines @@
         scoped_ptr<syncer::SyncChangeProcessor>(
           new syncer::FakeSyncChangeProcessor),
         scoped_ptr<syncer::SyncErrorFactory>(
             new syncer::SyncErrorFactoryMock));
   }
 
   void WaitForLoadFromLastSession() {
     content::RunAllBlockingPoolTasksUntilIdle();
   }
 
-  static KeyedService* GetTabRestoreService(
+  static scoped_ptr<KeyedService> GetTabRestoreService(
       content::BrowserContext* browser_context) {
-    // Ownership is tranfered to the profile.
-    return new PersistentTabRestoreService(
-        Profile::FromBrowserContext(browser_context), NULL);
+    return make_scoped_ptr(new PersistentTabRestoreService(
+        Profile::FromBrowserContext(browser_context), NULL));
   }
 
   browser_sync::OpenTabsUIDelegate* GetOpenTabsDelegate() {
     return manager_.get();
   }
 
   void RegisterRecentTabs(RecentTabsBuilderTestHelper* helper) {
     helper->ExportToSessionsSyncManager(manager_.get());
   }
 
@@ skipping 93 matching lines @@
       profile(), RecentTabsSubMenuModelTest::GetTabRestoreService);
 
   // Add 2 tabs and close them.
   AddTab(browser(), GURL("http://wnd/tab0"));
   AddTab(browser(), GURL("http://wnd/tab1"));
   browser()->tab_strip_model()->CloseAllTabs();
 
   // Create a SessionService for the profile (profile owns the service) and add
   // a window with a tab to this session.
   SessionService* session_service = new SessionService(profile());
-  SessionServiceFactory::SetForTestProfile(profile(), session_service);
+  SessionServiceFactory::SetForTestProfile(profile(),
+                                           make_scoped_ptr(session_service));
   SessionID tab_id;
   SessionID window_id;
   session_service->SetWindowType(window_id,
                                  Browser::TYPE_TABBED,
                                  SessionService::TYPE_NORMAL);
   session_service->SetTabWindow(window_id, tab_id);
   session_service->SetTabIndexInWindow(window_id, tab_id, 0);
   session_service->SetSelectedTabInWindow(window_id, 0);
   session_service->UpdateTabNavigation(
       window_id, tab_id,
@@ skipping 280 matching lines @@
   // 0           Recently closed heaer (disabled)
   // 1           <separator>
   // 2           No tabs from other Devices
 
   TestRecentTabsSubMenuModel model(NULL, browser(), NULL);
   EXPECT_EQ(3, model.GetItemCount());
   EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(0));
   EXPECT_NE(-1, model.GetMaxWidthForItemAtIndex(1));
   EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(2));
 }