Have content cancel requests for ResourceContexts when they shutdown, instead of depending on the e…

content/browser/in_process_webkit/dom_storage_browsertest.cc

Index: content/browser/in_process_webkit/dom_storage_browsertest.cc
===================================================================
--- content/browser/in_process_webkit/dom_storage_browsertest.cc	(revision 128565)
+++ content/browser/in_process_webkit/dom_storage_browsertest.cc	(working copy)
@@ -1,108 +0,0 @@
-// 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/file_path.h"
-#include "base/file_util.h"
-#include "base/scoped_temp_dir.h"
-#include "base/test/thread_test_helper.h"
-#include "chrome/test/base/in_process_browser_test.h"
-#include "content/browser/in_process_webkit/dom_storage_context_impl.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/common/url_constants.h"
-#include "content/test/test_browser_context.h"
-#include "googleurl/src/gurl.h"
-#include "webkit/dom_storage/dom_storage_types.h"
-#include "webkit/quota/special_storage_policy.h"
-
-#ifdef ENABLE_NEW_DOM_STORAGE_BACKEND
-// No longer applicable.
-#else
-
-using content::BrowserContext;
-using content::BrowserThread;
-
-typedef InProcessBrowserTest DOMStorageBrowserTest;
-
-namespace {
-
-class TestSpecialStoragePolicy : public quota::SpecialStoragePolicy {
- public:
-  TestSpecialStoragePolicy() {
-  }
-
-  virtual bool IsStorageProtected(const GURL& origin) OVERRIDE {
-    return origin.SchemeIs(chrome::kChromeDevToolsScheme);
-  }
-
-  virtual bool IsStorageUnlimited(const GURL& origin) OVERRIDE {
-    return false;
-  }
-
-  virtual bool IsFileHandler(const std::string& extension_id) OVERRIDE {
-    return false;
-  }
-
-  virtual bool IsStorageSessionOnly(const GURL& origin) OVERRIDE {
-    return false;
-  }
-
-  virtual bool HasSessionOnlyOrigins() OVERRIDE {
-    return false;
-  }
-};
-
-}  // namespace
-
-#if defined(OS_MACOSX)
-// http://crbug.com/115150. On Mac, failure rate is about 30% currently.
-#define MAYBE_ClearLocalState DISABLED_ClearLocalState
-#else
-#define MAYBE_ClearLocalState ClearLocalState
-#endif
-
-// In proc browser test is needed here because ClearLocalState indirectly calls
-// WebKit's isMainThread through WebSecurityOrigin->SecurityOrigin.
-IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, MAYBE_ClearLocalState) {
-  // Create test files.
-  ScopedTempDir temp_dir;
-  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
-  FilePath domstorage_dir = temp_dir.path().Append(
-      DOMStorageContextImpl::kLocalStorageDirectory);
-  ASSERT_TRUE(file_util::CreateDirectory(domstorage_dir));
-
-  FilePath::StringType file_name_1(FILE_PATH_LITERAL("http_foo_0"));
-  file_name_1.append(DOMStorageContextImpl::kLocalStorageExtension);
-  FilePath::StringType file_name_2(FILE_PATH_LITERAL("chrome-devtools_foo_0"));
-  file_name_2.append(DOMStorageContextImpl::kLocalStorageExtension);
-  FilePath temp_file_path_1 = domstorage_dir.Append(file_name_1);
-  FilePath temp_file_path_2 = domstorage_dir.Append(file_name_2);
-
-  ASSERT_EQ(1, file_util::WriteFile(temp_file_path_1, ".", 1));
-  ASSERT_EQ(1, file_util::WriteFile(temp_file_path_2, "o", 1));
-
-  // Create the scope which will ensure we run the destructor of the webkit
-  // context which should trigger the clean up.
-  {
-    TestBrowserContext browser_context;
-    browser_context.SetSpecialStoragePolicy(new TestSpecialStoragePolicy());
-    DOMStorageContextImpl* dom_storage_context =
-        static_cast<DOMStorageContextImpl*>(
-            BrowserContext::GetDOMStorageContext(&browser_context));
-    dom_storage_context->set_data_path_for_testing(temp_dir.path());
-    dom_storage_context->SetClearLocalState(true);
-  }
-  // Make sure we wait until the destructor has run.
-  scoped_refptr<base::ThreadTestHelper> helper(
-      new base::ThreadTestHelper(
-          BrowserThread::GetMessageLoopProxyForThread(
-              BrowserThread::WEBKIT_DEPRECATED)));
-  ASSERT_TRUE(helper->Run());
-
-  // Because we specified https for scheme to be skipped the second file
-  // should survive and the first go into vanity.
-  ASSERT_FALSE(file_util::PathExists(temp_file_path_1));
-  ASSERT_TRUE(file_util::PathExists(temp_file_path_2));
-}
-
-#endif  // ENABLE_NEW_DOM_STORAGE_BACKEND