Move the number conversions from string_util to a new file....

net/url_request/url_request_unittest.cc

 // Copyright (c) 2010 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 "net/url_request/url_request_unittest.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shlobj.h>
 #elif defined(USE_NSS)
 #include "base/nss_util.h"
 #endif
 
 #include <algorithm>
 #include <string>
 
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_piece.h"
-#include "base/string_util.h"
+#include "base/string_number_conversions.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/cookie_policy.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_log.h"
 #include "net/base/net_log_unittest.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_module.h"
 #include "net/base/net_util.h"
 #include "net/base/upload_data.h"
 #include "net/disk_cache/disk_cache.h"
@@ skipping 129 matching lines @@
 TEST_F(URLRequestTestHTTP, ProxyTunnelRedirectTest) {
   // In this unit test, we're using the HTTPTestServer as a proxy server and
   // issuing a CONNECT request with the magic host name "www.redirect.com".
   // The HTTPTestServer will return a 302 response, which we should not
   // follow.
   ASSERT_TRUE(NULL != server_.get());
   TestDelegate d;
   {
     URLRequest r(GURL("https://www.redirect.com/"), &d);
     std::string proxy("localhost:");
-    proxy.append(IntToString(kHTTPDefaultPort));
+    proxy.append(base::IntToString(kHTTPDefaultPort));
     r.set_context(new TestURLRequestContext(proxy));
 
     r.Start();
     EXPECT_TRUE(r.is_pending());
 
     MessageLoop::current()->Run();
 
     EXPECT_EQ(URLRequestStatus::FAILED, r.status().status());
     EXPECT_EQ(net::ERR_TUNNEL_CONNECTION_FAILED, r.status().os_error());
     EXPECT_EQ(1, d.response_started_count());
     // We should not have followed the redirect.
     EXPECT_EQ(0, d.received_redirect_count());
   }
 }
 
 TEST_F(URLRequestTestHTTP, UnexpectedServerAuthTest) {
   // In this unit test, we're using the HTTPTestServer as a proxy server and
   // issuing a CONNECT request with the magic host name "www.server-auth.com".
   // The HTTPTestServer will return a 401 response, which we should balk at.
   ASSERT_TRUE(NULL != server_.get());
   TestDelegate d;
   {
     URLRequest r(GURL("https://www.server-auth.com/"), &d);
     std::string proxy("localhost:");
-    proxy.append(IntToString(kHTTPDefaultPort));
+    proxy.append(base::IntToString(kHTTPDefaultPort));
     r.set_context(new TestURLRequestContext(proxy));
 
     r.Start();
     EXPECT_TRUE(r.is_pending());
 
     MessageLoop::current()->Run();
 
     EXPECT_EQ(URLRequestStatus::FAILED, r.status().status());
     EXPECT_EQ(net::ERR_TUNNEL_CONNECTION_FAILED, r.status().os_error());
   }
@@ skipping 1543 matching lines @@
 TEST_F(URLRequestTestHTTP, Post307RedirectPost) {
   const char kData[] = "hello world";
   ASSERT_TRUE(NULL != server_.get());
   TestDelegate d;
   TestURLRequest req(server_->TestServerPage("files/redirect307-to-echo"),
       &d);
   req.set_method("POST");
   req.set_upload(CreateSimpleUploadData(kData).get());
   net::HttpRequestHeaders headers;
   headers.SetHeader(net::HttpRequestHeaders::kContentLength,
-                    UintToString(arraysize(kData) - 1));
+                    base::UintToString(arraysize(kData) - 1));
   req.SetExtraRequestHeaders(headers);
   req.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ("POST", req.method());
   EXPECT_EQ(kData, d.data_received());
 }
 
 // Custom URLRequestJobs for use with interceptor tests
 class RestartTestJob : public URLRequestTestJob {
  public:
@@ skipping 785 matching lines @@
   TestURLRequest
       req(server_->TestServerPage("echoheaderoverride?Accept-Charset"), &d);
   req.set_context(new TestURLRequestContext());
   net::HttpRequestHeaders headers;
   headers.SetHeader(net::HttpRequestHeaders::kAcceptCharset, "koi-8r");
   req.SetExtraRequestHeaders(headers);
   req.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(std::string("koi-8r"), d.data_received());
 }