Introduce incognito preference settings.

chrome/browser/host_zoom_map_unittest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/host_zoom_map.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 81 matching lines @@
 TEST_F(HostZoomMapTest, ResetToDefaults) {
   scoped_refptr<HostZoomMap> map(new HostZoomMap(&profile_));
   map->SetZoomLevel(url_, kZoomLevel);
 
   PrefChangeRegistrar registrar;
   registrar.Init(prefs_);
   registrar.Add(prefs::kPerHostZoomLevels, &pref_observer_);
   SetPrefObserverExpectation();
   map->ResetToDefaults();
   EXPECT_EQ(0, map->GetZoomLevel(url_));
-  EXPECT_EQ(NULL, prefs_->GetDictionary(prefs::kPerHostZoomLevels));
+  DictionaryValue empty;
+  EXPECT_TRUE(
+      Value::Equals(&empty, prefs_->GetDictionary(prefs::kPerHostZoomLevels)));
 }
 
 TEST_F(HostZoomMapTest, ReloadOnPrefChange) {
   scoped_refptr<HostZoomMap> map(new HostZoomMap(&profile_));
   map->SetZoomLevel(url_, kZoomLevel);
 
   DictionaryValue dict;
   dict.SetWithoutPathExpansion(host_, Value::CreateRealValue(0));
   prefs_->Set(prefs::kPerHostZoomLevels, dict);
   EXPECT_EQ(0, map->GetZoomLevel(url_));
 }
 
 TEST_F(HostZoomMapTest, NoHost) {
   scoped_refptr<HostZoomMap> map(new HostZoomMap(&profile_));
   GURL file_url1_("file:///tmp/test.html");
   GURL file_url2_("file:///tmp/other.html");
   map->SetZoomLevel(file_url1_, kZoomLevel);
 
   EXPECT_EQ(kZoomLevel, map->GetZoomLevel(file_url1_));
   EXPECT_EQ(0, map->GetZoomLevel(file_url2_));
 }
 
 TEST_F(HostZoomMapTest, ChangeDefaultZoomLevel) {
   FundamentalValue zoom_level(kDefaultZoomLevel);
   prefs_->Set(prefs::kDefaultZoomLevel, zoom_level);
   scoped_refptr<HostZoomMap> map(new HostZoomMap(&profile_));
   EXPECT_EQ(kDefaultZoomLevel, map->GetZoomLevel(url_));
 }