Fix content_browsertests on Android.

content/test/content_test_launcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/test/test_launcher.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 26 matching lines @@
   }
 
   virtual void OnTestStart(const testing::TestInfo& test_info) OVERRIDE {
     content_client_.reset(new ShellContentClient);
     browser_content_client_.reset(new ShellContentBrowserClient());
     SetContentClient(content_client_.get());
     SetBrowserClientForTesting(browser_content_client_.get());
   }
 
   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:
   scoped_ptr<ShellContentClient> content_client_;
   scoped_ptr<ShellContentBrowserClient> browser_content_client_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentShellTestSuiteInitializer);
 };
 
 #if defined(OS_ANDROID)
@@ skipping 65 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate);
 };
 
 }  // namespace content
 
 int main(int argc, char** argv) {
   int default_jobs = std::max(1, base::SysInfo::NumberOfProcessors() / 2);
   content::ContentTestLauncherDelegate launcher_delegate;
   return LaunchTests(&launcher_delegate, default_jobs, argc, argv);
 }