Remove getters for HTML5 related objects from the ResourceContext interface. Half of them weren't u…

content/test/test_browser_context.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/test/test_browser_context.h"
 
 #include "base/file_path.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
 #include "content/browser/mock_resource_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 31 matching lines @@
 net::URLRequestContextGetter*
 TestBrowserContext::GetRequestContextForRenderProcess(int renderer_child_id) {
   return NULL;
 }
 
 net::URLRequestContextGetter* TestBrowserContext::GetRequestContextForMedia() {
   return NULL;
 }
 
 content::ResourceContext* TestBrowserContext::GetResourceContext() {
-  // TODO(phajdan.jr): Get rid of this nasty global.
-  return content::MockResourceContext::GetInstance();
+  if (!resource_context_.get())
+    resource_context_.reset(new content::MockResourceContext());
+  return resource_context_.get();
 }
 
 HostZoomMap* TestBrowserContext::GetHostZoomMap() {
   return NULL;
 }
 
 content::GeolocationPermissionContext*
 TestBrowserContext::GetGeolocationPermissionContext() {
   return NULL;
 }
 
 content::SpeechInputPreferences*
 TestBrowserContext::GetSpeechInputPreferences() {
   return NULL;
 }
 
 bool TestBrowserContext::DidLastSessionExitCleanly() {
   return true;
 }
 
 quota::SpecialStoragePolicy* TestBrowserContext::GetSpecialStoragePolicy() {
   return NULL;
 }