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

content/browser/web_contents/web_contents_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/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 36 matching lines @@
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/download_url_parameters.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/javascript_dialogs.h"
 #include "content/public/browser/load_from_memory_cache_details.h"
 #include "content/public/browser/load_notification_details.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/resource_request_details.h"
+#include "content/public/browser/storage_partition.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/browser/web_ui_controller_factory.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_restriction.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
@@ skipping 1159 matching lines @@
   // WebContentsView. In the future, we may want to create the view separately.
   WebContentsImpl* new_contents =
       new WebContentsImpl(GetBrowserContext(),
                           params.opener_suppressed ? NULL : this);
 
   // We must assign the SessionStorageNamespace before calling Init().
   const std::string& partition_id =
       content::GetContentClient()->browser()->
           GetStoragePartitionIdForSiteInstance(GetBrowserContext(),
                                                site_instance);
+  content::StoragePartition* partition =
+          BrowserContext::GetStoragePartition(GetBrowserContext(),

[Charlie Reis, 2012/08/14 18:50:12]

I guess this is another case where it would be useful to expose
GetStoragePartitionById.  Maybe it's worth it.  (Note my attempt at a shorter
name, which you're free to shoot down.)  :)

nit: Wrong indent here.

[awong, 2012/08/14 19:12:47]

Shorter name is better.  :) But decided to punt on this.  Fixed indent.

+                                              site_instance);
   DOMStorageContextImpl* dom_storage_context =
-      static_cast<DOMStorageContextImpl*>(
-          BrowserContext::GetDOMStorageContextByPartitionId(
-              GetBrowserContext(), partition_id));
+      static_cast<DOMStorageContextImpl*>(partition->GetDOMStorageContext());
   SessionStorageNamespaceImpl* session_storage_namespace_impl =
       static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace);
   CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context));
   new_contents->GetController().SetSessionStorageNamespace(
       partition_id,
       session_storage_namespace);
   new_contents->Init(GetBrowserContext(), site_instance, route_id, this);
 
   new_contents->set_opener_web_ui_type(GetWebUITypeForCurrentState());
 
@@ skipping 1934 matching lines @@
       old_browser_plugin_host()->embedder_render_process_host();
   *embedder_container_id = old_browser_plugin_host()->instance_id();
   int embedder_process_id =
       embedder_render_process_host ? embedder_render_process_host->GetID() : -1;
   if (embedder_process_id != -1) {
     *embedder_channel_name =
         StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(),
                      embedder_process_id);
   }
 }