Using pre-existing constants instead of hard-coding

Constants for https, http already exists in our_constants. This patch makes gurl use those constants instead of hrad-coded values. Also it adds constants for WS and WSS.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274179 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 8 insertions, 3 deletions

diff --git a/url/gurl.cc b/url/gurl.cc
index c79cdba..947403e 100644
--- a/url/gurl.cc
+++ b/url/gurl.cc
@@ -370,11 +370,11 @@ bool GURL::SchemeIs(const char* lower_ascii_scheme) const {
 }
 
 bool GURL::SchemeIsHTTPOrHTTPS() const {
-  return SchemeIs("http") || SchemeIs("https");
+  return SchemeIs(url::kHttpScheme) || SchemeIs(url::kHttpsScheme);
 }
 
 bool GURL::SchemeIsWSOrWSS() const {
-  return SchemeIs("ws") || SchemeIs("wss");
+  return SchemeIs(url::kWsScheme) || SchemeIs(url::kWssScheme);
 }
 
 int GURL::IntPort() const {
diff --git a/url/gurl.h b/url/gurl.h
index b8632b4..e830b1a 100644
--- a/url/gurl.h
+++ b/url/gurl.h
@@ -12,6 +12,7 @@
 #include "base/strings/string16.h"
 #include "url/url_canon.h"
 #include "url/url_canon_stdstring.h"
+#include "url/url_constants.h"
 #include "url/url_export.h"
 #include "url/url_parse.h"
 
@@ -231,7 +232,7 @@ class URL_EXPORT GURL {
 
   // If the scheme indicates a secure connection
   bool SchemeIsSecure() const {
-    return SchemeIs("https") || SchemeIs("wss") ||
+    return SchemeIs(url::kHttpsScheme) || SchemeIs(url::kWssScheme) ||
         (SchemeIsFileSystem() && inner_url() && inner_url()->SchemeIsSecure());
   }
 
diff --git a/url/url_constants.cc b/url/url_constants.cc
index 2949d44..ae58a05 100644
--- a/url/url_constants.cc
+++ b/url/url_constants.cc
@@ -15,5 +15,7 @@ const char kHttpScheme[] = "http";
 const char kHttpsScheme[] = "https";
 const char kJavaScriptScheme[] = "javascript";
 const char kMailToScheme[] = "mailto";
+const char kWsScheme[] = "ws";
+const char kWssScheme[] = "wss";
 
 }  // namespace url
diff --git a/url/url_constants.h b/url/url_constants.h
index 18b4bfc..07c454c 100644
--- a/url/url_constants.h
+++ b/url/url_constants.h
@@ -18,6 +18,8 @@ URL_EXPORT extern const char kHttpScheme[];
 URL_EXPORT extern const char kHttpsScheme[];
 URL_EXPORT extern const char kJavaScriptScheme[];
 URL_EXPORT extern const char kMailToScheme[];
+URL_EXPORT extern const char kWsScheme[];
+URL_EXPORT extern const char kWssScheme[];
 
 }  // namespace url