chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc - Issue 1165913002: [Cleanup] Used scoped pointers in KeyedServiceFactory's SetTestingFactory functions.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc

Issue 1165913002: [Cleanup] Used scoped pointers in KeyedServiceFactory's SetTestingFactory functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Finish renaming profile -> context Created 5 years, 6 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

« no previous file with comments | « chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc ('k') | chrome/browser/ui/views/frame/test_with_browser_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc

diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc

index f84b7ab1ba4bf987ca5849bdbc04a6c8dc825c9b..2ab778ea91d8db3c8a3fc13a5020cfa05dd16265 100644

--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc

+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc

@@ -4,6 +4,7 @@

#include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"

+#include "base/memory/scoped_ptr.h"

#include "base/prefs/pref_service.h"

#include "base/strings/utf_string_conversions.h"

#include "base/values.h"

@@ -124,12 +125,12 @@ class BookmarkBarViewTest : public BrowserWithTestWindowTest {

scoped_ptr<BookmarkBarView> bookmark_bar_view_;

private:

- static KeyedService* CreateTemplateURLService(

+ static scoped_ptr<KeyedService> CreateTemplateURLService(

content::BrowserContext* profile) {

- return new TemplateURLService(

+ return make_scoped_ptr(new TemplateURLService(

static_cast<Profile*>(profile)->GetPrefs(),

make_scoped_ptr(new SearchTermsData), NULL,

- scoped_ptr<TemplateURLServiceClient>(), NULL, NULL, base::Closure());

+ scoped_ptr<TemplateURLServiceClient>(), NULL, NULL, base::Closure()));

}

scoped_ptr<ScopedTestingLocalState> local_state_;