| Index: public/testing/WebPreferences.h
|
| diff --git a/public/testing/WebPreferences.h b/public/testing/WebPreferences.h
|
| index 2dbed40daec747359d913646f966bb8e0ec89268..e49088af9ec1aea648b0bacb0b6b41c916971579 100644
|
| --- a/public/testing/WebPreferences.h
|
| +++ b/public/testing/WebPreferences.h
|
| @@ -36,7 +36,7 @@
|
| #include "public/platform/WebURL.h"
|
| #include "public/web/WebSettings.h"
|
|
|
| -namespace WebKit {
|
| +namespace blink {
|
| class WebView;
|
| }
|
|
|
| @@ -51,7 +51,7 @@ struct WEBTESTRUNNER_EXPORT WebPreferences {
|
| bool allowFileAccessFromFileURLs;
|
| bool allowRunningOfInsecureContent;
|
| bool authorAndUserStylesEnabled;
|
| - WebKit::WebString defaultTextEncodingName;
|
| + blink::WebString defaultTextEncodingName;
|
| bool experimentalWebGLEnabled;
|
| bool experimentalCSSRegionsEnabled;
|
| bool experimentalCSSGridLayoutEnabled;
|
| @@ -63,9 +63,9 @@ struct WEBTESTRUNNER_EXPORT WebPreferences {
|
| bool loadsImagesAutomatically;
|
| bool offlineWebApplicationCacheEnabled;
|
| bool pluginsEnabled;
|
| - WebKit::WebURL userStyleSheetLocation;
|
| + blink::WebURL userStyleSheetLocation;
|
| bool allowUniversalAccessFromFileURLs;
|
| - WebKit::WebSettings::EditingBehavior editingBehavior;
|
| + blink::WebSettings::EditingBehavior editingBehavior;
|
| bool tabsToLinks;
|
| bool hyperlinkAuditingEnabled;
|
| bool caretBrowsingEnabled;
|
|
|