| Index: chrome/renderer/content_settings_observer.cc
|
| diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc
|
| index 1bfc461ea955394b4cb88e2cad4f782ae2fde5b4..a7819b2a7771e9c6281b321950af3dfe0dc151bd 100644
|
| --- a/chrome/renderer/content_settings_observer.cc
|
| +++ b/chrome/renderer/content_settings_observer.cc
|
| @@ -243,7 +243,7 @@ void ContentSettingsObserver::DidCommitProvisionalLoad(bool is_new_navigation) {
|
| // If we start failing this DCHECK, please makes sure we don't regress
|
| // this bug: http://code.google.com/p/chromium/issues/detail?id=79304
|
| DCHECK(frame->document().securityOrigin().toString() == "null" ||
|
| - !url.SchemeIs(content::kDataScheme));
|
| + !url.SchemeIs(url::kDataScheme));
|
| }
|
|
|
| bool ContentSettingsObserver::allowDatabase(const WebString& name,
|
| @@ -665,8 +665,8 @@ bool ContentSettingsObserver::IsWhitelistedForContentSettings(
|
|
|
| // If the scheme is file:, an empty file name indicates a directory listing,
|
| // which requires JavaScript to function properly.
|
| - if (EqualsASCII(origin.protocol(), content::kFileScheme)) {
|
| - return document_url.SchemeIs(content::kFileScheme) &&
|
| + if (EqualsASCII(origin.protocol(), url::kFileScheme)) {
|
| + return document_url.SchemeIs(url::kFileScheme) &&
|
| document_url.ExtractFileName().empty();
|
| }
|
|
|
|
|