Introduce incognito preference settings.

chrome/browser/sync/glue/preference_model_associator_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/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/sync/glue/preference_model_associator.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 15 matching lines @@
                                                          &expression_dict);
     if (!found) {
       expression_dict = new DictionaryValue;
       patterns_dict->SetWithoutPathExpansion(expression, expression_dict);
     }
     expression_dict->SetWithoutPathExpansion(
         content_type,
         Value::CreateIntegerValue(setting));
   }
 
-  void SetPrefToNull(const std::string& pref_name) {
-    scoped_ptr<Value> null_value(Value::CreateNullValue());
-    pref_service_->Set(pref_name.c_str(), *null_value);
-  }
-
   void SetPrefToEmpty(const std::string& pref_name) {
     scoped_ptr<Value> empty_value;
     const PrefService::Preference* pref =
         pref_service_->FindPreference(pref_name.c_str());
     ASSERT_TRUE(pref);
     Value::ValueType type = pref->GetType();
     if (type == Value::TYPE_DICTIONARY)
       empty_value.reset(new DictionaryValue);
     else if (type == Value::TYPE_LIST)
       empty_value.reset(new ListValue);
@@ skipping 30 matching lines @@
 TEST_F(ListPreferenceMergeTest, NotListOrDictionary) {
   pref_service_->SetString(prefs::kHomePage, local_url0_);
   const PrefService::Preference* pref =
       pref_service_->FindPreference(prefs::kHomePage);
   scoped_ptr<Value> server_value(Value::CreateStringValue(server_url0_));
   scoped_ptr<Value> merged_value(
       PreferenceModelAssociator::MergePreference(*pref, *server_value));
   EXPECT_TRUE(merged_value->Equals(server_value.get()));
 }
 
-TEST_F(ListPreferenceMergeTest, LocalNull) {
-  SetPrefToNull(prefs::kURLsToRestoreOnStartup);
-  const PrefService::Preference* pref =
-      pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup);
-  scoped_ptr<Value> merged_value(
-      PreferenceModelAssociator::MergePreference(*pref, server_url_list_));
-  EXPECT_TRUE(merged_value->Equals(&server_url_list_));
-}
-
 TEST_F(ListPreferenceMergeTest, LocalEmpty) {
   SetPrefToEmpty(prefs::kURLsToRestoreOnStartup);
   const PrefService::Preference* pref =
       pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup);
   scoped_ptr<Value> merged_value(
       PreferenceModelAssociator::MergePreference(*pref, server_url_list_));
   EXPECT_TRUE(merged_value->Equals(&server_url_list_));
 }
 
 TEST_F(ListPreferenceMergeTest, ServerNull) {
@@ skipping 15 matching lines @@
       pref_service_->GetMutableList(prefs::kURLsToRestoreOnStartup);
   local_list_value->Append(Value::CreateStringValue(local_url0_));
 
   const PrefService::Preference* pref =
       pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup);
   scoped_ptr<Value> merged_value(
       PreferenceModelAssociator::MergePreference(*pref, *empty_value));
   EXPECT_TRUE(merged_value->Equals(local_list_value));
 }
 
-TEST_F(ListPreferenceMergeTest, BothNull) {
-  SetPrefToNull(prefs::kURLsToRestoreOnStartup);
-  scoped_ptr<Value> null_value(Value::CreateNullValue());
-  const PrefService::Preference* pref =
-      pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup);
-  scoped_ptr<Value> merged_value(
-      PreferenceModelAssociator::MergePreference(*pref, *null_value));
-  EXPECT_TRUE(merged_value->Equals(null_value.get()));
-}
-
 TEST_F(ListPreferenceMergeTest, Merge) {
   ListValue* local_list_value =
       pref_service_->GetMutableList(prefs::kURLsToRestoreOnStartup);
   local_list_value->Append(Value::CreateStringValue(local_url0_));
   local_list_value->Append(Value::CreateStringValue(local_url1_));
 
   const PrefService::Preference* pref =
       pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup);
   scoped_ptr<Value> merged_value(
       PreferenceModelAssociator::MergePreference(*pref, server_url_list_));
@@ skipping 56 matching lines @@
   }
 
   std::string expression0_;
   std::string expression1_;
   std::string expression2_;
   std::string content_type0_;
   std::string content_type1_;
   DictionaryValue server_patterns_;
 };
 
-TEST_F(DictionaryPreferenceMergeTest, LocalNull) {
-  SetPrefToNull(prefs::kContentSettingsPatterns);
-  const PrefService::Preference* pref =
-      pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup);
-  scoped_ptr<Value> merged_value(
-      PreferenceModelAssociator::MergePreference(*pref, server_patterns_));
-  EXPECT_TRUE(merged_value->Equals(&server_patterns_));
-}
-
 TEST_F(DictionaryPreferenceMergeTest, LocalEmpty) {
   SetPrefToEmpty(prefs::kContentSettingsPatterns);
   const PrefService::Preference* pref =
       pref_service_->FindPreference(prefs::kContentSettingsPatterns);
   scoped_ptr<Value> merged_value(
       PreferenceModelAssociator::MergePreference(*pref, server_patterns_));
   EXPECT_TRUE(merged_value->Equals(&server_patterns_));
 }
 
 TEST_F(DictionaryPreferenceMergeTest, ServerNull) {
@@ skipping 15 matching lines @@
       pref_service_->GetMutableDictionary(prefs::kContentSettingsPatterns);
   SetContentPattern(local_dict_value, expression2_, content_type0_, 1);
 
   const PrefService::Preference* pref =
       pref_service_->FindPreference(prefs::kContentSettingsPatterns);
   scoped_ptr<Value> merged_value(
       PreferenceModelAssociator::MergePreference(*pref, *empty_value));
   EXPECT_TRUE(merged_value->Equals(local_dict_value));
 }
 
-TEST_F(DictionaryPreferenceMergeTest, BothNull) {
-  scoped_ptr<Value> null_value(Value::CreateNullValue());
-  SetPrefToNull(prefs::kContentSettingsPatterns);
-  const PrefService::Preference* pref =
-      pref_service_->FindPreference(prefs::kContentSettingsPatterns);
-  scoped_ptr<Value> merged_value(
-      PreferenceModelAssociator::MergePreference(*pref, *null_value));
-  EXPECT_TRUE(merged_value->Equals(null_value.get()));
-}
-
 TEST_F(DictionaryPreferenceMergeTest, MergeNoConflicts) {
   DictionaryValue* local_dict_value =
       pref_service_->GetMutableDictionary(prefs::kContentSettingsPatterns);
   SetContentPattern(local_dict_value, expression2_, content_type0_, 1);
 
   scoped_ptr<Value> merged_value(PreferenceModelAssociator::MergePreference(
       *pref_service_->FindPreference(prefs::kContentSettingsPatterns),
       server_patterns_));
 
   DictionaryValue expected;
@@ skipping 116 matching lines @@
   EXPECT_TRUE(MergeListPreference(prefs::kDesktopNotificationDeniedOrigins));
 }
 
 TEST_F(IndividualPreferenceMergeTest, ContentSettingsPatterns) {
   EXPECT_TRUE(MergeDictionaryPreference(prefs::kContentSettingsPatterns));
 }
 
 TEST_F(IndividualPreferenceMergeTest, GeolocationContentSettings) {
   EXPECT_TRUE(MergeDictionaryPreference(prefs::kGeolocationContentSettings));
 }