Move StoragePartition into content/public and remove BrowserContext::GetDOMStorageContext().

content/browser/web_contents/interstitial_page_impl.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/browser/web_contents/interstitial_page_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 14 matching lines @@
 #include "content/port/browser/render_view_host_delegate_view.h"
 #include "content/port/browser/render_widget_host_view_port.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/dom_operation_notification_details.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
+#include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/page_transition_types.h"
 #include "net/base/escape.h"
 #include "net/url_request/url_request_context_getter.h"
 
 using content::BrowserThread;
 using content::DomOperationNotificationDetails;
 using content::InterstitialPageDelegate;
 using content::NativeWebKeyboardEvent;
@@ skipping 435 matching lines @@
   return web_contents_;
 }
 
 RenderViewHost* InterstitialPageImpl::CreateRenderViewHost() {
   // Interstitial pages don't want to share the session storage so we mint a
   // new one.
   using content::BrowserContext;
   BrowserContext* browser_context = web_contents()->GetBrowserContext();
   scoped_refptr<SiteInstance> site_instance =
       SiteInstance::Create(browser_context);
-  const std::string& partition_id =
-      content::GetContentClient()->browser()->
-          GetStoragePartitionIdForSiteInstance(browser_context,
-                                               site_instance);
   DOMStorageContextImpl* dom_storage_context =
       static_cast<DOMStorageContextImpl*>(
-          BrowserContext::GetDOMStorageContextByPartitionId(browser_context,
-                                                            partition_id));
+          BrowserContext::GetStoragePartition(
+              browser_context, site_instance)->GetDOMStorageContext());
   SessionStorageNamespaceImpl* session_storage_namespace_impl =
       new SessionStorageNamespaceImpl(dom_storage_context);
 
   RenderViewHostImpl* render_view_host = new RenderViewHostImpl(
       site_instance, this, this, MSG_ROUTING_NONE, false,
       session_storage_namespace_impl);
   web_contents_->RenderViewForInterstitialPageCreated(render_view_host);
   return render_view_host;
 }
 
@@ skipping 250 matching lines @@
   if (!web_contents->GetDelegateView())
     return;
 
   web_contents->GetDelegateView()->TakeFocus(reverse);
 }
 
 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply(
     int request_id, int number_of_matches, const gfx::Rect& selection_rect,
     int active_match_ordinal, bool final_update) {
 }