Merge 233505 "Tear down IndexedDB dispatcher before WebKit is to..."

content/browser/indexed_db/indexed_db_browsertest.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 413 matching lines @@
       FROM_HERE,
       base::Bind(&IndexedDBContextImpl::DeleteForOrigin,
                  GetContext(),
                  GURL("file:///")));
 
   string16 expected_title16(ASCIIToUTF16("connection closed"));
   TitleWatcher title_watcher(shell()->web_contents(), expected_title16);
   EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
 }
 
+class IndexedDBBrowserTestSingleProcess : public IndexedDBBrowserTest {
+ public:
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    command_line->AppendSwitch(switches::kSingleProcess);
+  }
+};
+
+IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestSingleProcess,
+                       RenderThreadShutdownTest) {
+  SimpleTest(GetTestUrl("indexeddb", "shutdown_with_requests.html"));
+}
+
 }  // namespace content