Rewrite std::string("") to std::string(), Linux edition.

net/socket/ssl_client_socket_pool_unittest.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.
 
 #include "net/http/http_proxy_client_socket_pool.h"
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 61 matching lines @@
   ExpectConnectTimingHasTimes(load_timing_info.connect_timing,
                               CONNECT_TIMING_HAS_SSL_TIMES);
   ExpectLoadTimingHasOnlyConnectionTimes(load_timing_info);
 }
 
 class SSLClientSocketPoolTest : public testing::Test {
  protected:
   SSLClientSocketPoolTest()
       : proxy_service_(ProxyService::CreateDirect()),
         ssl_config_service_(new SSLConfigServiceDefaults),
-        http_auth_handler_factory_(HttpAuthHandlerFactory::CreateDefault(
-            &host_resolver_)),
+        http_auth_handler_factory_(
+            HttpAuthHandlerFactory::CreateDefault(&host_resolver_)),
         session_(CreateNetworkSession()),
-        direct_transport_socket_params_(new TransportSocketParams(
-            HostPortPair("host", 443), MEDIUM, false, false,
-            OnHostResolutionCallback())),
+        direct_transport_socket_params_(
+            new TransportSocketParams(HostPortPair("host", 443),
+                                      MEDIUM,
+                                      false,
+                                      false,
+                                      OnHostResolutionCallback())),
         transport_histograms_("MockTCP"),
-        transport_socket_pool_(
-            kMaxSockets,
-            kMaxSocketsPerGroup,
-            &transport_histograms_,
-            &socket_factory_),
-        proxy_transport_socket_params_(new TransportSocketParams(
-            HostPortPair("proxy", 443), MEDIUM, false, false,
-            OnHostResolutionCallback())),
-        socks_socket_params_(new SOCKSSocketParams(
-            proxy_transport_socket_params_, true,
-            HostPortPair("sockshost", 443), MEDIUM)),
+        transport_socket_pool_(kMaxSockets,
+                               kMaxSocketsPerGroup,
+                               &transport_histograms_,
+                               &socket_factory_),
+        proxy_transport_socket_params_(
+            new TransportSocketParams(HostPortPair("proxy", 443),
+                                      MEDIUM,
+                                      false,
+                                      false,
+                                      OnHostResolutionCallback())),
+        socks_socket_params_(
+            new SOCKSSocketParams(proxy_transport_socket_params_,
+                                  true,
+                                  HostPortPair("sockshost", 443),
+                                  MEDIUM)),
         socks_histograms_("MockSOCKS"),
-        socks_socket_pool_(
-            kMaxSockets,
-            kMaxSocketsPerGroup,
-            &socks_histograms_,
-            &transport_socket_pool_),
-        http_proxy_socket_params_(new HttpProxySocketParams(
-            proxy_transport_socket_params_, NULL, GURL("http://host"), "",
-            HostPortPair("host", 80),
-            session_->http_auth_cache(),
-            session_->http_auth_handler_factory(),
-            session_->spdy_session_pool(),
-            true)),
+        socks_socket_pool_(kMaxSockets,
+                           kMaxSocketsPerGroup,
+                           &socks_histograms_,
+                           &transport_socket_pool_),
+        http_proxy_socket_params_(
+            new HttpProxySocketParams(proxy_transport_socket_params_,
+                                      NULL,
+                                      GURL("http://host"),
+                                      std::string(),
+                                      HostPortPair("host", 80),
+                                      session_->http_auth_cache(),
+                                      session_->http_auth_handler_factory(),
+                                      session_->spdy_session_pool(),
+                                      true)),
         http_proxy_histograms_("MockHttpProxy"),
-        http_proxy_socket_pool_(
-            kMaxSockets,
-            kMaxSocketsPerGroup,
-            &http_proxy_histograms_,
-            &host_resolver_,
-            &transport_socket_pool_,
-            NULL,
-            NULL) {
+        http_proxy_socket_pool_(kMaxSockets,
+                                kMaxSocketsPerGroup,
+                                &http_proxy_histograms_,
+                                &host_resolver_,
+                                &transport_socket_pool_,
+                                NULL,
+                                NULL) {
     scoped_refptr<SSLConfigService> ssl_config_service(
         new SSLConfigServiceDefaults);
     ssl_config_service->GetSSLConfig(&ssl_config_);
   }
 
   void CreatePool(bool transport_pool, bool http_proxy_pool, bool socks_pool) {
     ssl_histograms_.reset(new ClientSocketPoolHistograms("SSLUnitTest"));
     pool_.reset(new SSLClientSocketPool(
         kMaxSockets,
         kMaxSocketsPerGroup,
         ssl_histograms_.get(),
         NULL /* host_resolver */,
         NULL /* cert_verifier */,
         NULL /* server_bound_cert_service */,
         NULL /* transport_security_state */,
-        ""   /* ssl_session_cache_shard */,
+        std::string() /* ssl_session_cache_shard */,
         &socket_factory_,
         transport_pool ? &transport_socket_pool_ : NULL,
         socks_pool ? &socks_socket_pool_ : NULL,
         http_proxy_pool ? &http_proxy_socket_pool_ : NULL,
         NULL,
         NULL));
   }
 
   scoped_refptr<SSLSocketParams> SSLParams(ProxyServer::Scheme proxy,
                                            bool want_spdy_over_npn) {
@@ skipping 567 matching lines @@
     HostPortProxyPair pair;
     AddressList addresses;
   } test_hosts[] = {
     { "www.webkit.org",    "192.0.2.33,192.168.0.1,192.168.0.5" },
     { "code.google.com",   "192.168.0.2,192.168.0.3,192.168.0.5" },
     { "js.webkit.org",     "192.168.0.4,192.168.0.1,192.0.2.33" },
   };
 
   host_resolver_.set_synchronous_mode(true);
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_hosts); i++) {
-    host_resolver_.rules()->AddIPLiteralRule(test_hosts[i].name,
-        test_hosts[i].iplist, "");
+    host_resolver_.rules()->AddIPLiteralRule(
+        test_hosts[i].name, test_hosts[i].iplist, std::string());
 
     // This test requires that the HostResolver cache be populated.  Normal
     // code would have done this already, but we do it manually.
     HostResolver::RequestInfo info(HostPortPair(test_hosts[i].name, kTestPort));
     host_resolver_.Resolve(info, &test_hosts[i].addresses, CompletionCallback(),
                            NULL, BoundNetLog());
 
     // Setup a HostPortProxyPair
     test_hosts[i].pair = HostPortProxyPair(
         HostPortPair(test_hosts[i].name, kTestPort), ProxyServer::Direct());
@@ skipping 61 matching lines @@
     HostPortProxyPair pair;
     AddressList addresses;
   } test_hosts[] = {
     { "www.webkit.org",    "192.0.2.33,192.168.0.1,192.168.0.5" },
     { "js.webkit.com",     "192.168.0.4,192.168.0.1,192.0.2.33" },
   };
 
   TestCompletionCallback callback;
   int rv;
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_hosts); i++) {
-    host_resolver_.rules()->AddIPLiteralRule(test_hosts[i].name,
-        test_hosts[i].iplist, "");
+    host_resolver_.rules()->AddIPLiteralRule(
+        test_hosts[i].name, test_hosts[i].iplist, std::string());
 
     // This test requires that the HostResolver cache be populated.  Normal
     // code would have done this already, but we do it manually.
     HostResolver::RequestInfo info(HostPortPair(test_hosts[i].name, kTestPort));
     rv = host_resolver_.Resolve(info, &test_hosts[i].addresses,
                                 callback.callback(), NULL, BoundNetLog());
     EXPECT_EQ(OK, callback.GetResult(rv));
 
     // Setup a HostPortProxyPair
     test_hosts[i].pair = HostPortProxyPair(
@@ skipping 64 matching lines @@
   ssl.channel_id_sent = true;
   ssl.SetNextProto(kProtoSPDY2);
   TestIPPoolingDisabled(&ssl);
 }
 
 // It would be nice to also test the timeouts in SSLClientSocketPool.
 
 }  // namespace
 
 }  // namespace net