content/test/content_test_launcher.cc - Issue 27518013: Fix content_browsertests on Android.

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: content/test/content_test_launcher.cc

Issue 27518013: Fix content_browsertests on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: change to not resetting ContentClient Created 7 years, 1 month 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: content/test/content_test_launcher.cc

diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc

index fae46c850fe7bba9bed76ac110d38d828708f98a..2deb5427108462676ec27dd916c37b9db85a9149 100644

--- a/content/test/content_test_launcher.cc

+++ b/content/test/content_test_launcher.cc

@@ -44,9 +44,11 @@ class ContentShellTestSuiteInitializer

}

virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {

+#if !defined(OS_ANDROID)

jam 2013/11/18 05:41:10 nit: please add a comment about why this is done

browser_content_client_.reset();

content_client_.reset();

SetContentClient(NULL);

+#endif

}

private:

« no previous file with comments | « no previous file | no next file » | no next file with comments »