Move some content url constants to /url.

chrome/browser/chromeos/attestation/platform_verification_flow.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform_verification_flow.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
@@ skipping 13 matching lines @@
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
+#include "net/base/url_constants.h"
 #include "net/cert/x509_certificate.h"
 
 namespace {
 
 const char kDefaultHttpsPort[] = "443";
 const int kTimeoutInSeconds = 8;
 
 // A callback method to handle DBus errors.
 void DBusCallback(const base::Callback<void(bool)>& on_success,
                   const base::Closure& on_failure,
@@ skipping 394 matching lines @@
   CHECK(url.is_valid());
   // Build a pattern to represent scheme and host.
   scoped_ptr<ContentSettingsPattern::BuilderInterface> builder(
       ContentSettingsPattern::CreateBuilder(false));
   builder->WithScheme(url.scheme())
          ->WithDomainWildcard()
          ->WithHost(url.host())
          ->WithPathWildcard();
   if (!url.port().empty())
     builder->WithPort(url.port());
-  else if (url.SchemeIs(content::kHttpsScheme))
+  else if (url.SchemeIs(net::kHttpsScheme))
     builder->WithPort(kDefaultHttpsPort);
-  else if (url.SchemeIs(content::kHttpScheme))
+  else if (url.SchemeIs(net::kHttpScheme))
     builder->WithPortWildcard();
   ContentSettingsPattern pattern = builder->Build();
   if (pattern.IsValid()) {
     ContentSetting setting = allow_domain ? CONTENT_SETTING_ALLOW
                                           : CONTENT_SETTING_BLOCK;
     content_settings->SetContentSetting(
         pattern,
         pattern,
         CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
         std::string(),
         setting);
   } else {
     LOG(WARNING) << "Not recording action: invalid URL pattern";
   }
 }
 
 bool PlatformVerificationFlow::IsExpired(const std::string& certificate) {
   scoped_refptr<net::X509Certificate> x509(
       net::X509Certificate::CreateFromBytes(certificate.data(),
                                             certificate.length()));
   if (!x509.get() || x509->valid_expiry().is_null()) {
     LOG(WARNING) << "Failed to parse certificate, cannot check expiry.";
     return false;
   }
   return (base::Time::Now() > x509->valid_expiry());
 }
 
 }  // namespace attestation
 }  // namespace chromeos