Commit 2c29c312 authored by tfarina's avatar tfarina Committed by Commit bot

content: Change appcache_interfaces.* to use contants from url/ component.

BUG=394382
R=avi@chromium.org

Review URL: https://codereview.chromium.org/874073002

Cr-Commit-Position: refs/heads/master@{#313635}
parent c2467847
...@@ -7,14 +7,13 @@ ...@@ -7,14 +7,13 @@
#include <set> #include <set>
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "content/public/common/url_constants.h"
#include "net/url_request/url_request.h" #include "net/url_request/url_request.h"
#include "url/gurl.h" #include "url/gurl.h"
#include "url/url_constants.h"
namespace content { namespace content {
const char kHttpScheme[] = "http";
const char kHttpsScheme[] = "https";
const char kDevToolsScheme[] = "chrome-devtools";
const char kHttpGETMethod[] = "GET"; const char kHttpGETMethod[] = "GET";
const char kHttpHEADMethod[] = "HEAD"; const char kHttpHEADMethod[] = "HEAD";
...@@ -112,8 +111,9 @@ bool AppCacheNamespace::IsMatch(const GURL& url) const { ...@@ -112,8 +111,9 @@ bool AppCacheNamespace::IsMatch(const GURL& url) const {
} }
bool IsSchemeSupportedForAppCache(const GURL& url) { bool IsSchemeSupportedForAppCache(const GURL& url) {
bool supported = url.SchemeIs(kHttpScheme) || url.SchemeIs(kHttpsScheme) || bool supported = url.SchemeIs(url::kHttpScheme) ||
url.SchemeIs(kDevToolsScheme); url.SchemeIs(url::kHttpsScheme) ||
url.SchemeIs(kChromeDevToolsScheme);
#ifndef NDEBUG #ifndef NDEBUG
// TODO(michaeln): It would be really nice if this could optionally work for // TODO(michaeln): It would be really nice if this could optionally work for
......
...@@ -163,11 +163,6 @@ class CONTENT_EXPORT AppCacheBackend { ...@@ -163,11 +163,6 @@ class CONTENT_EXPORT AppCacheBackend {
}; };
// Useful string constants. // Useful string constants.
// Note: These are also defined elsewhere in the chrome code base in
// url_contants.h .cc, however the content library can not have
// any dependencies on the chrome library, so we can't use them in here.
CONTENT_EXPORT extern const char kHttpScheme[];
CONTENT_EXPORT extern const char kHttpsScheme[];
CONTENT_EXPORT extern const char kHttpGETMethod[]; CONTENT_EXPORT extern const char kHttpGETMethod[];
CONTENT_EXPORT extern const char kHttpHEADMethod[]; CONTENT_EXPORT extern const char kHttpHEADMethod[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment