Migrate HostZoomMap to live in StoragePartition.

content/browser/browser_context.cc

Index: content/browser/browser_context.cc
diff --git a/content/browser/browser_context.cc b/content/browser/browser_context.cc
index 8acae2d3668221667851988b7371d477bc7a7170..bf1847f076879cd04d825a08fcb33d8d9776a52f 100644
--- a/content/browser/browser_context.cc
+++ b/content/browser/browser_context.cc
@@ -15,6 +15,7 @@
 #include "content/public/browser/blob_handle.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
+#include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/site_instance.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/cookies/cookie_store.h"
@@ -84,6 +85,12 @@ void SaveSessionStateOnIndexedDBThread(
   indexed_db_context->SetForceKeepSessionState();
 }
 
+void ChangeDefaultZoomForStoragePartition(
+    double level,
+    content::StoragePartition* partition) {
+  partition->GetHostZoomMap()->SetDefaultZoomLevel(level);
+}
+
 }  // namespace
 
 // static
@@ -104,6 +111,13 @@ void BrowserContext::GarbageCollectStoragePartitions(
       active_paths.Pass(), done);
 }
 
+// static
+void BrowserContext::SetDefaultZoomLevel(BrowserContext* context,

[Fady Samuel, 2014/08/15 15:03:00]

This is unnecessary here. It isn't used as far as I can tell in content.

[wjmaclean, 2014/08/15 22:13:49]

This is being removed anyway with moving default zoom level to per-partition.

+                                         double level) {
+  GetStoragePartitionMap(context)->ForEach(
+      base::Bind(ChangeDefaultZoomForStoragePartition, level));

[Fady Samuel, 2014/08/15 15:03:01]

In profile, just set the default partition's default zoom level. 

[wjmaclean, 2014/08/15 22:13:49]

n/a

+}
+
 DownloadManager* BrowserContext::GetDownloadManager(
     BrowserContext* context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -279,4 +293,13 @@ BrowserContext::~BrowserContext() {
 #endif
 }
 
+double BrowserContext::GetDefaultZoomLevel() const {

[Fady Samuel, 2014/08/15 15:03:01]

Remove this.

+  return 0;
+}
+
+scoped_ptr<ZoomLevelPrefsStore>
+BrowserContext::CreateZoomLevelPrefsStore() {
+  return scoped_ptr<ZoomLevelPrefsStore>();
+}
+
 }  // namespace content