Move some content url constants to /url.

chrome/browser/safe_browsing/safe_browsing_test.cc

 // Copyright (c) 2012 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.
 //
 // This test uses the safebrowsing test server published at
 // http://code.google.com/p/google-safe-browsing/ to test the safebrowsing
 // protocol implemetation. Details of the safebrowsing testing flow is
 // documented at
 // http://code.google.com/p/google-safe-browsing/wiki/ProtocolTesting
 //
@@ skipping 27 matching lines @@
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/test/test_browser_thread.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_log.h"
+#include "net/base/url_constants.h"
 #include "net/dns/host_resolver.h"
 #include "net/test/python_utils.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
 namespace {
@@ skipping 26 matching lines @@
     if (urls[i].empty())
       continue;
     PhishingUrl phishing_url;
     std::vector<std::string> record_parts;
     base::SplitString(urls[i], '\t', &record_parts);
     if (record_parts.size() != 3) {
       LOG(ERROR) << "Unexpected URL format in phishing URL list: "
                  << urls[i];
       return false;
     }
-    phishing_url.url = std::string(content::kHttpScheme) +
-        "://" + record_parts[0];
+    phishing_url.url = std::string(net::kHttpScheme) + "://" + record_parts[0];
     phishing_url.list_name = record_parts[1];
     if (record_parts[2] == "yes") {
       phishing_url.is_phishing = true;
     } else if (record_parts[2] == "no") {
       phishing_url.is_phishing = false;
     } else {
       LOG(ERROR) << "Unrecognized expectation in " << urls[i]
                  << ": " << record_parts[2];
       return false;
     }
@@ skipping 463 matching lines @@
               safe_browsing_helper->FetchDBToVerify(test_server(), step));
     EXPECT_GT(safe_browsing_helper->response_data().size(), 0U);
     last_step = step;
   }
 
   // Verifies with server if test is done and waits till server responses.
   EXPECT_EQ(net::URLRequestStatus::SUCCESS,
             safe_browsing_helper->VerifyTestComplete(test_server(), last_step));
   EXPECT_EQ("yes", safe_browsing_helper->response_data());
 }