Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / prefs / chrome_pref_service_unittest.cc

diff --git a/src/chrome/browser/prefs/chrome_pref_service_unittest.cc b/src/chrome/browser/prefs/chrome_pref_service_unittest.cc
index a0e322d..4b64946 100644 (file)
--- a/src/chrome/browser/prefs/chrome_pref_service_unittest.cc
+++ b/src/chrome/browser/prefs/chrome_pref_service_unittest.cc
@@ -23,11 +23,12 @@
 #include "components/policy/core/browser/configuration_policy_pref_store.h"
 #include "components/policy/core/common/mock_configuration_policy_provider.h"
 #include "components/pref_registry/pref_registry_syncable.h"
+#include "content/public/common/web_preferences.h"
 #include "content/public/test/web_contents_tester.h"
 #include "ui/base/test/data/resource.h"
-#include "webkit/common/webpreferences.h"
 
 using content::WebContentsTester;
+using content::WebPreferences;
 
 TEST(ChromePrefServiceTest, UpdateCommandLinePrefStore) {
   TestingPrefServiceSimple prefs;
@@ -100,15 +101,15 @@ class ChromePrefServiceWebKitPrefs : public ChromeRenderViewHostTestHarness {
     TestingPrefServiceSyncable* pref_services =
         profile()->GetTestingPrefService();
     pref_services->SetUserPref(prefs::kDefaultCharset,
-                               base::Value::CreateStringValue("utf8"));
+                               new base::StringValue("utf8"));
     pref_services->SetUserPref(prefs::kWebKitDefaultFontSize,
-                               base::Value::CreateIntegerValue(20));
+                               new base::FundamentalValue(20));
     pref_services->SetUserPref(prefs::kWebKitTextAreasAreResizable,
-                               base::Value::CreateBooleanValue(false));
+                               new base::FundamentalValue(false));
     pref_services->SetUserPref(prefs::kWebKitUsesUniversalDetector,
-                               base::Value::CreateBooleanValue(true));
+                               new base::FundamentalValue(true));
     pref_services->SetUserPref("webkit.webprefs.foo",
-                               base::Value::CreateStringValue("bar"));
+                               new base::StringValue("bar"));
   }
 };
 
@@ -116,7 +117,7 @@ class ChromePrefServiceWebKitPrefs : public ChromeRenderViewHostTestHarness {
 // to a WebPreferences object.
 TEST_F(ChromePrefServiceWebKitPrefs, PrefsCopied) {
   WebPreferences webkit_prefs =
-      WebContentsTester::For(web_contents())->TestGetWebkitPrefs();
+      WebContentsTester::For(web_contents())->TestComputeWebkitPrefs();
 
   // These values have been overridden by the profile preferences.
   EXPECT_EQ("UTF-8", webkit_prefs.default_encoding);