Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(618)

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: add comment 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..ec384a76170965bb87168c267e93e57785ea87df 100644
--- a/content/test/content_test_launcher.cc
+++ b/content/test/content_test_launcher.cc
@@ -44,9 +44,13 @@ class ContentShellTestSuiteInitializer
}
virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
+#if !defined(OS_ANDROID)
+ // On Android, production code doesn't reset ContentClient during shutdown.
+ // We try to do the same thing as production. Refer to crbug.com/181069.
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 »

Powered by Google App Engine
This is Rietveld 408576698