Migrate HostZoomMap to live in StoragePartition.

content/browser/download/download_manager_impl_unittest.cc

Index: content/browser/download/download_manager_impl_unittest.cc
diff --git a/content/browser/download/download_manager_impl_unittest.cc b/content/browser/download/download_manager_impl_unittest.cc
index 0c5eb5239667568bd3d1f0be024fcc94ec7cf5c4..fc43b2c238acb44ba3c2426953d8ad341e7705c6 100644
--- a/content/browser/download/download_manager_impl_unittest.cc
+++ b/content/browser/download/download_manager_impl_unittest.cc
@@ -28,6 +28,7 @@
 #include "content/public/browser/download_interrupt_reasons.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager_delegate.h"
+#include "content/public/browser/zoom_level_delegate.h"
 #include "content/public/test/mock_download_item.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread.h"
@@ -53,6 +54,16 @@ ACTION_TEMPLATE(RunCallback,
   return ::std::tr1::get<k>(args).Run(p0);
 }
 
+// Create a specialization so we can mock an override for

[Charlie Reis, 2014/11/11 05:29:22]

This looks questionable to me, but it's well beyond my knowledge.  Is it
necessary for the mock framework?

[wjmaclean, 2014/11/11 19:20:52]

It seems to be necessary.

I think the main issue here is that gmock cannot instantiate ZoomLevelDelegate
directly in order to try and create the desired return value.

The mock function complains if you try to override a function and change its
return type (i.e. ask the mock to return a scoped_ptr to a local implementation
of ZoomLevelDelegate), and this was the only way I could find to get it to
return a null scoped_ptr<ZoomLevelDelegate>. Nicely enough, to get a non-null
value in this framework, one can implement MockZoomLevelDelegate and have the
specialization instantiate it for you, so it's extensible.

If there's a better way, I'm happy to learn how to do it. :-)

+// scoped_ptr<content::ZoomLevelDelegate>
+// BrowserContext::CreateZoomLevelDelegate(const base::FilePath&).
+template<>
+class scoped_ptr<content::ZoomLevelDelegate> {
+ public:
+  scoped_ptr() {}
+  ~scoped_ptr() {}
+};
+
 namespace content {
 class ByteStreamReader;
 
@@ -401,6 +412,8 @@ class MockBrowserContext : public BrowserContext {
   ~MockBrowserContext() {}
 
   MOCK_CONST_METHOD0(GetPath, base::FilePath());
+  MOCK_METHOD1(CreateZoomLevelDelegate,
+               scoped_ptr<ZoomLevelDelegate>(const base::FilePath&));
   MOCK_CONST_METHOD0(IsOffTheRecord, bool());
   MOCK_METHOD0(GetRequestContext, net::URLRequestContextGetter*());
   MOCK_METHOD1(GetRequestContextForRenderProcess,