Remove most unnecessary uses of "net::" in net/base/.

Also removes several empty and unused gtest test fixtures.

R=willchan@chromium.org

Review URL: http://codereview.chromium.org/6676134

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

1 files changed, 31 insertions, 29 deletions

diff --git a/net/base/address_list_unittest.cc b/net/base/address_list_unittest.cc
index 2a13f45..e387f25 100644
--- a/net/base/address_list_unittest.cc
+++ b/net/base/address_list_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -14,16 +14,17 @@
 #endif
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace net {
 namespace {
 
 // Use getaddrinfo() to allocate an addrinfo structure.
 int CreateAddressList(const std::string& hostname, int port,
-                      net::AddressList* addrlist) {
+                      AddressList* addrlist) {
 #if defined(OS_WIN)
-  net::EnsureWinsockInit();
+  EnsureWinsockInit();
 #endif
   int rv = SystemHostResolverProc(hostname,
-                                  net::ADDRESS_FAMILY_UNSPECIFIED,
+                                  ADDRESS_FAMILY_UNSPECIFIED,
                                   0,
                                   addrlist, NULL);
   if (rv == 0)
@@ -31,15 +32,15 @@ int CreateAddressList(const std::string& hostname, int port,
   return rv;
 }
 
-void CreateLongAddressList(net::AddressList* addrlist, int port) {
+void CreateLongAddressList(AddressList* addrlist, int port) {
   EXPECT_EQ(0, CreateAddressList("192.168.1.1", port, addrlist));
-  net::AddressList second_list;
+  AddressList second_list;
   EXPECT_EQ(0, CreateAddressList("192.168.1.2", port, &second_list));
   addrlist->Append(second_list.head());
 }
 
 TEST(AddressListTest, GetPort) {
-  net::AddressList addrlist;
+  AddressList addrlist;
   EXPECT_EQ(0, CreateAddressList("192.168.1.1", 81, &addrlist));
   EXPECT_EQ(81, addrlist.GetPort());
 
@@ -48,13 +49,13 @@ TEST(AddressListTest, GetPort) {
 }
 
 TEST(AddressListTest, Assignment) {
-  net::AddressList addrlist1;
+  AddressList addrlist1;
   EXPECT_EQ(0, CreateAddressList("192.168.1.1", 85, &addrlist1));
   EXPECT_EQ(85, addrlist1.GetPort());
 
   // Should reference the same data as addrlist1 -- so when we change addrlist1
   // both are changed.
-  net::AddressList addrlist2 = addrlist1;
+  AddressList addrlist2 = addrlist1;
   EXPECT_EQ(85, addrlist2.GetPort());
 
   addrlist1.SetPort(80);
@@ -63,11 +64,11 @@ TEST(AddressListTest, Assignment) {
 }
 
 TEST(AddressListTest, CopyRecursive) {
-  net::AddressList addrlist1;
+  AddressList addrlist1;
   CreateLongAddressList(&addrlist1, 85);
   EXPECT_EQ(85, addrlist1.GetPort());
 
-  net::AddressList addrlist2;
+  AddressList addrlist2;
   addrlist2.Copy(addrlist1.head(), true);
 
   ASSERT_TRUE(addrlist2.head()->ai_next != NULL);
@@ -85,11 +86,11 @@ TEST(AddressListTest, CopyRecursive) {
 }
 
 TEST(AddressListTest, CopyNonRecursive) {
-  net::AddressList addrlist1;
+  AddressList addrlist1;
   CreateLongAddressList(&addrlist1, 85);
   EXPECT_EQ(85, addrlist1.GetPort());
 
-  net::AddressList addrlist2;
+  AddressList addrlist2;
   addrlist2.Copy(addrlist1.head(), false);
 
   ASSERT_TRUE(addrlist2.head()->ai_next == NULL);
@@ -107,10 +108,10 @@ TEST(AddressListTest, CopyNonRecursive) {
 }
 
 TEST(AddressListTest, Append) {
-  net::AddressList addrlist1;
+  AddressList addrlist1;
   EXPECT_EQ(0, CreateAddressList("192.168.1.1", 11, &addrlist1));
   EXPECT_EQ(11, addrlist1.GetPort());
-  net::AddressList addrlist2;
+  AddressList addrlist2;
   EXPECT_EQ(0, CreateAddressList("192.168.1.2", 12, &addrlist2));
   EXPECT_EQ(12, addrlist2.GetPort());
 
@@ -118,7 +119,7 @@ TEST(AddressListTest, Append) {
   addrlist1.Append(addrlist2.head());
   ASSERT_TRUE(addrlist1.head()->ai_next != NULL);
 
-  net::AddressList addrlist3;
+  AddressList addrlist3;
   addrlist3.Copy(addrlist1.head()->ai_next, false);
   EXPECT_EQ(12, addrlist3.GetPort());
 }
@@ -141,7 +142,7 @@ TEST(AddressListTest, Canonical) {
 
   // Copy the addrinfo struct into an AddressList object and
   // make sure it seems correct.
-  net::AddressList addrlist1;
+  AddressList addrlist1;
   addrlist1.Copy(&ai, true);
   const struct addrinfo* addrinfo1 = addrlist1.head();
   EXPECT_TRUE(addrinfo1 != NULL);
@@ -151,7 +152,7 @@ TEST(AddressListTest, Canonical) {
   EXPECT_EQ("canonical.bar.com", canon_name1);
 
   // Copy the AddressList to another one.
-  net::AddressList addrlist2;
+  AddressList addrlist2;
   addrlist2.Copy(addrinfo1, true);
   const struct addrinfo* addrinfo2 = addrlist2.head();
   EXPECT_TRUE(addrinfo2 != NULL);
@@ -166,7 +167,7 @@ TEST(AddressListTest, Canonical) {
   // Make sure that GetCanonicalName correctly returns false
   // when ai_canonname is NULL.
   ai.ai_canonname = NULL;
-  net::AddressList addrlist_no_canon;
+  AddressList addrlist_no_canon;
   addrlist_no_canon.Copy(&ai, true);
   std::string canon_name3 = "blah";
   EXPECT_FALSE(addrlist_no_canon.GetCanonicalName(&canon_name3));
@@ -185,7 +186,7 @@ TEST(AddressListTest, IPLiteralConstructor) {
     { "2001:db8:0::42", "2001:db8::42", true },
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); i++) {
-    net::AddressList expected_list;
+    AddressList expected_list;
     int rv = CreateAddressList(tests[i].canonical_ip_address, 80,
                                &expected_list);
     if (tests[i].is_ipv6 && rv != 0) {
@@ -196,9 +197,9 @@ TEST(AddressListTest, IPLiteralConstructor) {
     ASSERT_EQ(0, rv);
     const struct addrinfo* good_ai = expected_list.head();
 
-    net::IPAddressNumber ip_number;
-    net::ParseIPLiteralToNumber(tests[i].ip_address, &ip_number);
-    net::AddressList test_list(ip_number, 80, true);
+    IPAddressNumber ip_number;
+    ParseIPLiteralToNumber(tests[i].ip_address, &ip_number);
+    AddressList test_list(ip_number, 80, true);
     const struct addrinfo* test_ai = test_list.head();
 
     EXPECT_EQ(good_ai->ai_family, test_ai->ai_family);
@@ -226,7 +227,7 @@ TEST(AddressListTest, AddressFromAddrInfo) {
     { "2001:db8:0::42", "2001:db8::42", true },
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); i++) {
-    net::AddressList expected_list;
+    AddressList expected_list;
     int rv = CreateAddressList(tests[i].canonical_ip_address, 80,
                                &expected_list);
     if (tests[i].is_ipv6 && rv != 0) {
@@ -237,11 +238,11 @@ TEST(AddressListTest, AddressFromAddrInfo) {
     ASSERT_EQ(0, rv);
     const struct addrinfo* good_ai = expected_list.head();
 
-    scoped_ptr<net::AddressList> test_list(
-        net::AddressList::CreateAddressListFromSockaddr(good_ai->ai_addr,
-                                                        good_ai->ai_addrlen,
-                                                        SOCK_STREAM,
-                                                        IPPROTO_TCP));
+    scoped_ptr<AddressList> test_list(
+        AddressList::CreateAddressListFromSockaddr(good_ai->ai_addr,
+                                                   good_ai->ai_addrlen,
+                                                   SOCK_STREAM,
+                                                   IPPROTO_TCP));
     const struct addrinfo* test_ai = test_list->head();
 
     EXPECT_EQ(good_ai->ai_family, test_ai->ai_family);
@@ -255,3 +256,4 @@ TEST(AddressListTest, AddressFromAddrInfo) {
 }
 
 }  // namespace
+}  // namespace net