athena/test/base/athena_test_helper.cc - Issue 653563004: NULL -> nullptr under athena/

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: athena/test/base/athena_test_helper.cc

Issue 653563004: NULL -> nullptr under athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: Created 6 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:

Index: athena/test/base/athena_test_helper.cc

diff --git a/athena/test/base/athena_test_helper.cc b/athena/test/base/athena_test_helper.cc

index 42e04d1c55bc54a5a775f81af566cfe8036b2b97..538ed1c91cfb2db64d5bacd98b1e036a83e98748 100644

--- a/athena/test/base/athena_test_helper.cc

+++ b/athena/test/base/athena_test_helper.cc

@@ -65,7 +65,7 @@ void AthenaTestHelper::SetUp(ui::ContextFactory* context_factory) {

athena::ExtensionsDelegate::CreateExtensionsDelegateForTest();

athena::StartAthenaSession(new SampleActivityFactory(),

make_scoped_ptr(new TestAppModelBuilder()),

- CreateSearchControllerFactory(NULL));

+ CreateSearchControllerFactory(nullptr));

}

void AthenaTestHelper::TearDown() {

« no previous file with comments | « athena/test/base/activity_lifetime_tracker.cc ('k') | athena/test/base/sample_activity.cc » ('j') | no next file with comments »