Migrate HostZoomMap to live in StoragePartition.

chrome/browser/profiles/off_the_record_profile_impl_unittest.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 "chrome/browser/profiles/off_the_record_profile_impl.h"
 
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/run_loop.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_io_thread_state.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/common/page_zoom.h"
+#include "content/public/test/mock_resource_context.h"
 #include "net/dns/mock_host_resolver.h"
 
 using content::HostZoomMap;
 
 namespace {
 
 class TestingProfileWithHostZoomMap : public TestingProfile {
  public:
   TestingProfileWithHostZoomMap() {
     zoom_subscription_ =
@@ skipping 26 matching lines @@
       host_zoom_dictionary->SetWithoutPathExpansion(
           change.host, new base::FundamentalValue(level));
     }
   }
 
   scoped_ptr<HostZoomMap::Subscription> zoom_subscription_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingProfileWithHostZoomMap);
 };
 
+base::Closure ThreadSafeQuit(base::RunLoop* run_loop) {
+  if (content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)) {
+    return run_loop->QuitClosure();
+  } else {
+    using base::Bind;
+    using base::IgnoreResult;
+    return Bind(IgnoreResult(&base::MessageLoopProxy::PostTask),
+                base::MessageLoopProxy::current(),
+                FROM_HERE,
+                run_loop->QuitClosure());
+  }
+}
+
 }  // namespace
 
 // We need to have a BrowserProcess in g_browser_process variable, since
 // OffTheRecordProfileImpl ctor uses it in
 // ProfileIOData::InitializeProfileParams.
 class OffTheRecordProfileImplTest : public BrowserWithTestWindowTest {
  protected:
   OffTheRecordProfileImplTest() {}
 
   virtual ~OffTheRecordProfileImplTest() {}
 
   // testing::Test overrides:
   virtual void SetUp() OVERRIDE {
     profile_manager_.reset(new TestingProfileManager(browser_process()));
     ASSERT_TRUE(profile_manager_->SetUp());
 
     testing_io_thread_state_.reset(new chrome::TestingIOThreadState());
+    base::RunLoop run_loop;

[awong, 2014/08/11 22:36:33]

Is it possible to use something like:
 
https://code.google.com/p/chromium/codesearch#chromium/src/content/public/tes...

?

[wjmaclean, 2014/08/12 16:57:44]

Actually, don't even need that. This is cruft from the attempts to fix this
test, and I just forgot to remove it.

+    CHECK(content::BrowserThread::PostTask(
+        content::BrowserThread::IO,
+        FROM_HERE,
+        base::Bind(&OffTheRecordProfileImplTest::InitResolver,
+                   base::Unretained(this),
+                   ThreadSafeQuit(&run_loop))));
+    run_loop.Run();
+
+    BrowserWithTestWindowTest::SetUp();
+  }
+
+  void InitResolver(const base::Closure& done) {
     testing_io_thread_state_->io_thread_state()->globals()->host_resolver.reset(
         new net::MockHostResolver());
-
-    BrowserWithTestWindowTest::SetUp();
+    done.Run();
   }
 
   virtual void TearDown() OVERRIDE {
     BrowserWithTestWindowTest::TearDown();
 
     testing_io_thread_state_.reset();
 
     profile_manager_.reset();
   }
 
@@ skipping 37 matching lines @@
   ASSERT_TRUE(parent_zoom_map);
 
   parent_zoom_map->SetZoomLevelForHost(host, zoom_level_25);
   ASSERT_EQ(parent_zoom_map->GetZoomLevelForHostAndScheme("http", host),
       zoom_level_25);
 
   // TODO(yosin) We need to wait ProfileImpl::Observe done for
   // OnZoomLevelChanged.
 
   // Prepare an off the record profile owned by the parent profile.
-  parent_profile->SetOffTheRecordProfile(
-      scoped_ptr<Profile>(new OffTheRecordProfileImpl(parent_profile)));
   OffTheRecordProfileImpl* child_profile =
       static_cast<OffTheRecordProfileImpl*>(
           parent_profile->GetOffTheRecordProfile());
-  child_profile->InitIoData();
-  child_profile->InitHostZoomMap();
 
   // Prepare child host zoom map.
   HostZoomMap* child_zoom_map =
       HostZoomMap::GetForBrowserContext(child_profile);
   ASSERT_TRUE(child_zoom_map);
 
   // Verify.
   EXPECT_NE(parent_zoom_map, child_zoom_map);
 
   EXPECT_EQ(parent_zoom_map->GetZoomLevelForHostAndScheme("http", host),
@@ skipping 12 matching lines @@
   parent_zoom_map->SetZoomLevelForHost(host, zoom_level_40);
   ASSERT_EQ(
       parent_zoom_map->GetZoomLevelForHostAndScheme("http", host),
       zoom_level_40);
 
   EXPECT_EQ(parent_zoom_map->GetZoomLevelForHostAndScheme("http", host),
             child_zoom_map->GetZoomLevelForHostAndScheme("http", host)) <<
                 "Parent change should propagate to child.";
   base::RunLoop().RunUntilIdle();
 }