| 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:
|
|
|