Remove the migration code from content_settings::DefaultProvider.

chrome/browser/prefs/pref_functional_browsertest.cc

 // Copyright 2013 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 <string>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 69 matching lines @@
       "    window.domAutomationController.send(true);"
       "  }"
       "}"
       "window.domAutomationController.send(false);";
   EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
       browser()->tab_strip_model()->GetActiveWebContents(),
       script,
       &result));
   EXPECT_TRUE(result);
 
-  base::DictionaryValue value;
-  value.SetInteger("images", 2);
-  browser()->profile()->GetPrefs()->Set(prefs::kDefaultContentSettings,
-                                        value);
+  browser()->profile()->GetPrefs()->SetInteger(prefs::kDefaultImagesSetting, 2);

[markusheintz_, 2015/07/27 08:51:32]

Can you use the enum value that corresponds to the int 2 here or add a comment
saying which value 2 represents.

[msramek, 2015/07/27 09:13:27]

Done.

 
   ui_test_utils::NavigateToURL(
       browser(),
       test_server()->GetURL("files/settings/image_page.html"));
 
   result = false;
   EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
       browser()->tab_strip_model()->GetActiveWebContents(),
       script,
       &result));
@@ skipping 117 matching lines @@
   EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
   EXPECT_FALSE(prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled));
   EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
 }
 
 // Verify that we have some Local State prefs.
 IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, TestHaveLocalStatePrefs) {
   EXPECT_TRUE(g_browser_process->local_state()->GetPreferenceValues().get());
 }