Fix an AppCacheStorageImpl leak in SiteInstanceTest.SiteInstanceDestructor by running the message l…

content/browser/site_instance_impl_unittest.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 <string>

[jam, 2012/09/06 16:58:03]

including string is quite unnecessary.. i would say the same for vector. i
understand about iwyu, but there are some very basic headers that are assumed to
be included (i.e. just like basictypes.h or build_config.h, which aren't
included here)

[Lei Zhang, 2012/09/06 18:16:43]

Ok, maybe we should take it out of the linter...

+#include <vector>
+
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/browsing_instance.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
@@ skipping 60 matching lines @@
 class SiteInstanceTestClient : public TestContentClient {
  public:
   SiteInstanceTestClient() {
   }
 
   virtual bool HasWebUIScheme(const GURL& url) const OVERRIDE {
     return url.SchemeIs(chrome::kChromeUIScheme);
   }
 };
 
-class SiteInstanceTestBrowserClient :
-    public content::TestContentBrowserClient {
+class SiteInstanceTestBrowserClient : public content::TestContentBrowserClient {
  public:
   SiteInstanceTestBrowserClient()
       : privileged_process_id_(-1) {
   }
 
   virtual content::WebUIControllerFactory*
       GetWebUIControllerFactory() OVERRIDE {
     return &factory_;
   }
 
@@ skipping 31 matching lines @@
     url_util::AddStandardScheme(kPrivilegedScheme);
     url_util::AddStandardScheme(chrome::kChromeUIScheme);
   }
 
   virtual void TearDown() {
     // Ensure that no RenderProcessHosts are left over after the tests.
     EXPECT_TRUE(content::RenderProcessHost::AllHostsIterator().IsAtEnd());
 
     content::GetContentClient()->set_browser_for_testing(old_browser_client_);
     content::SetContentClient(old_client_);
+
+    // http://crbug.com/143565 found SiteInstanceTest leaking an
+    // AppCacheDatabase. This happens because some part of the test indirectly
+    // calls StoragePartitionImplMap::PostCreateInitialization(), which posts
+    // a task to the IO thread to create the AppCacheDatabase. Since the
+    // message loop is not running, the AppCacheDatabase ends up getting
+    // created when DrainMessageLoops() gets called at the end of a test case.
+    // Immediately after, the test case ends and the AppCacheDatabase gets
+    // scheduled for deletion. Here, call DrainMessageLoops() again so the
+    // AppCacheDatabase actually gets deleted.
+    DrainMessageLoops();
   }
 
   void set_privileged_process_id(int process_id) {
     browser_client_.set_privileged_process_id(process_id);
   }
 
   void DrainMessageLoops() {
     // We don't just do this in TearDown() because we create TestBrowserContext
     // objects in each test, which will be destructed before
     // TearDown() is called.
@@ skipping 520 matching lines @@
   EXPECT_TRUE(instance->HasProcess());
 
   EXPECT_FALSE(instance->HasWrongProcessForURL(GURL("http://evernote.com")));
   EXPECT_FALSE(instance->HasWrongProcessForURL(
       GURL("javascript:alert(document.location.href);")));
 
   EXPECT_TRUE(instance->HasWrongProcessForURL(GURL("chrome://settings")));
 
   DrainMessageLoops();
 }