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, 70 insertions, 66 deletions

diff --git a/net/base/static_cookie_policy_unittest.cc b/net/base/static_cookie_policy_unittest.cc
index 57dc4fa..9fac666 100644
--- a/net/base/static_cookie_policy_unittest.cc
+++ b/net/base/static_cookie_policy_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.
 
@@ -7,6 +7,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "googleurl/src/gurl.h"
 
+namespace net {
+
 class StaticCookiePolicyTest : public testing::Test {
  public:
   StaticCookiePolicyTest()
@@ -15,7 +17,7 @@ class StaticCookiePolicyTest : public testing::Test {
         url_google_mail_("http://mail.google.izzle"),
         url_google_analytics_("http://www.googleanalytics.izzle") {
   }
-  void SetPolicyType(net::StaticCookiePolicy::Type type) {
+  void SetPolicyType(StaticCookiePolicy::Type type) {
     policy_.set_type(type);
   }
   int CanGetCookies(const GURL& url, const GURL& first_party) {
@@ -25,7 +27,7 @@ class StaticCookiePolicyTest : public testing::Test {
     return policy_.CanSetCookie(url, first_party, std::string(), NULL);
   }
  protected:
-  net::StaticCookiePolicy policy_;
+  StaticCookiePolicy policy_;
   GURL url_google_;
   GURL url_google_secure_;
   GURL url_google_mail_;
@@ -33,79 +35,81 @@ class StaticCookiePolicyTest : public testing::Test {
 };
 
 TEST_F(StaticCookiePolicyTest, DefaultPolicyTest) {
-  EXPECT_EQ(net::OK, CanGetCookies(url_google_, url_google_));
-  EXPECT_EQ(net::OK, CanGetCookies(url_google_, url_google_secure_));
-  EXPECT_EQ(net::OK, CanGetCookies(url_google_, url_google_mail_));
-  EXPECT_EQ(net::OK, CanGetCookies(url_google_, url_google_analytics_));
-  EXPECT_EQ(net::OK, CanGetCookies(url_google_, GURL()));
-
-  EXPECT_EQ(net::OK, CanSetCookie(url_google_, url_google_));
-  EXPECT_EQ(net::OK, CanSetCookie(url_google_, url_google_secure_));
-  EXPECT_EQ(net::OK, CanSetCookie(url_google_, url_google_mail_));
-  EXPECT_EQ(net::OK, CanSetCookie(url_google_, url_google_analytics_));
-  EXPECT_EQ(net::OK, CanSetCookie(url_google_, GURL()));
+  EXPECT_EQ(OK, CanGetCookies(url_google_, url_google_));
+  EXPECT_EQ(OK, CanGetCookies(url_google_, url_google_secure_));
+  EXPECT_EQ(OK, CanGetCookies(url_google_, url_google_mail_));
+  EXPECT_EQ(OK, CanGetCookies(url_google_, url_google_analytics_));
+  EXPECT_EQ(OK, CanGetCookies(url_google_, GURL()));
+
+  EXPECT_EQ(OK, CanSetCookie(url_google_, url_google_));
+  EXPECT_EQ(OK, CanSetCookie(url_google_, url_google_secure_));
+  EXPECT_EQ(OK, CanSetCookie(url_google_, url_google_mail_));
+  EXPECT_EQ(OK, CanSetCookie(url_google_, url_google_analytics_));
+  EXPECT_EQ(OK, CanSetCookie(url_google_, GURL()));
 }
 
 TEST_F(StaticCookiePolicyTest, AllowAllCookiesTest) {
-  SetPolicyType(net::StaticCookiePolicy::ALLOW_ALL_COOKIES);
-
-  EXPECT_EQ(net::OK, CanGetCookies(url_google_, url_google_));
-  EXPECT_EQ(net::OK, CanGetCookies(url_google_, url_google_secure_));
-  EXPECT_EQ(net::OK, CanGetCookies(url_google_, url_google_mail_));
-  EXPECT_EQ(net::OK, CanGetCookies(url_google_, url_google_analytics_));
-  EXPECT_EQ(net::OK, CanGetCookies(url_google_, GURL()));
-
-  EXPECT_EQ(net::OK, CanSetCookie(url_google_, url_google_));
-  EXPECT_EQ(net::OK, CanSetCookie(url_google_, url_google_secure_));
-  EXPECT_EQ(net::OK, CanSetCookie(url_google_, url_google_mail_));
-  EXPECT_EQ(net::OK, CanSetCookie(url_google_, url_google_analytics_));
-  EXPECT_EQ(net::OK, CanSetCookie(url_google_, GURL()));
+  SetPolicyType(StaticCookiePolicy::ALLOW_ALL_COOKIES);
+
+  EXPECT_EQ(OK, CanGetCookies(url_google_, url_google_));
+  EXPECT_EQ(OK, CanGetCookies(url_google_, url_google_secure_));
+  EXPECT_EQ(OK, CanGetCookies(url_google_, url_google_mail_));
+  EXPECT_EQ(OK, CanGetCookies(url_google_, url_google_analytics_));
+  EXPECT_EQ(OK, CanGetCookies(url_google_, GURL()));
+
+  EXPECT_EQ(OK, CanSetCookie(url_google_, url_google_));
+  EXPECT_EQ(OK, CanSetCookie(url_google_, url_google_secure_));
+  EXPECT_EQ(OK, CanSetCookie(url_google_, url_google_mail_));
+  EXPECT_EQ(OK, CanSetCookie(url_google_, url_google_analytics_));
+  EXPECT_EQ(OK, CanSetCookie(url_google_, GURL()));
 }
 
 TEST_F(StaticCookiePolicyTest, BlockSettingThirdPartyCookiesTest) {
-  SetPolicyType(net::StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES);
-
-  EXPECT_EQ(net::OK, CanGetCookies(url_google_, url_google_));
-  EXPECT_EQ(net::OK, CanGetCookies(url_google_, url_google_secure_));
-  EXPECT_EQ(net::OK, CanGetCookies(url_google_, url_google_mail_));
-  EXPECT_EQ(net::OK, CanGetCookies(url_google_, url_google_analytics_));
-  EXPECT_EQ(net::OK, CanGetCookies(url_google_, GURL()));
-
-  EXPECT_EQ(net::OK, CanSetCookie(url_google_, url_google_));
-  EXPECT_EQ(net::OK, CanSetCookie(url_google_, url_google_secure_));
-  EXPECT_EQ(net::OK, CanSetCookie(url_google_, url_google_mail_));
-  EXPECT_NE(net::OK, CanSetCookie(url_google_, url_google_analytics_));
-  EXPECT_EQ(net::OK, CanSetCookie(url_google_, GURL()));
+  SetPolicyType(StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES);
+
+  EXPECT_EQ(OK, CanGetCookies(url_google_, url_google_));
+  EXPECT_EQ(OK, CanGetCookies(url_google_, url_google_secure_));
+  EXPECT_EQ(OK, CanGetCookies(url_google_, url_google_mail_));
+  EXPECT_EQ(OK, CanGetCookies(url_google_, url_google_analytics_));
+  EXPECT_EQ(OK, CanGetCookies(url_google_, GURL()));
+
+  EXPECT_EQ(OK, CanSetCookie(url_google_, url_google_));
+  EXPECT_EQ(OK, CanSetCookie(url_google_, url_google_secure_));
+  EXPECT_EQ(OK, CanSetCookie(url_google_, url_google_mail_));
+  EXPECT_NE(OK, CanSetCookie(url_google_, url_google_analytics_));
+  EXPECT_EQ(OK, CanSetCookie(url_google_, GURL()));
 }
 
 TEST_F(StaticCookiePolicyTest, BlockAllThirdPartyCookiesTest) {
-  SetPolicyType(net::StaticCookiePolicy::BLOCK_ALL_THIRD_PARTY_COOKIES);
-
-  EXPECT_EQ(net::OK, CanGetCookies(url_google_, url_google_));
-  EXPECT_EQ(net::OK, CanGetCookies(url_google_, url_google_secure_));
-  EXPECT_EQ(net::OK, CanGetCookies(url_google_, url_google_mail_));
-  EXPECT_NE(net::OK, CanGetCookies(url_google_, url_google_analytics_));
-  EXPECT_EQ(net::OK, CanGetCookies(url_google_, GURL()));
-
-  EXPECT_EQ(net::OK, CanSetCookie(url_google_, url_google_));
-  EXPECT_EQ(net::OK, CanSetCookie(url_google_, url_google_secure_));
-  EXPECT_EQ(net::OK, CanSetCookie(url_google_, url_google_mail_));
-  EXPECT_NE(net::OK, CanSetCookie(url_google_, url_google_analytics_));
-  EXPECT_EQ(net::OK, CanSetCookie(url_google_, GURL()));
+  SetPolicyType(StaticCookiePolicy::BLOCK_ALL_THIRD_PARTY_COOKIES);
+
+  EXPECT_EQ(OK, CanGetCookies(url_google_, url_google_));
+  EXPECT_EQ(OK, CanGetCookies(url_google_, url_google_secure_));
+  EXPECT_EQ(OK, CanGetCookies(url_google_, url_google_mail_));
+  EXPECT_NE(OK, CanGetCookies(url_google_, url_google_analytics_));
+  EXPECT_EQ(OK, CanGetCookies(url_google_, GURL()));
+
+  EXPECT_EQ(OK, CanSetCookie(url_google_, url_google_));
+  EXPECT_EQ(OK, CanSetCookie(url_google_, url_google_secure_));
+  EXPECT_EQ(OK, CanSetCookie(url_google_, url_google_mail_));
+  EXPECT_NE(OK, CanSetCookie(url_google_, url_google_analytics_));
+  EXPECT_EQ(OK, CanSetCookie(url_google_, GURL()));
 }
 
 TEST_F(StaticCookiePolicyTest, BlockAllCookiesTest) {
-  SetPolicyType(net::StaticCookiePolicy::BLOCK_ALL_COOKIES);
-
-  EXPECT_NE(net::OK, CanGetCookies(url_google_, url_google_));
-  EXPECT_NE(net::OK, CanGetCookies(url_google_, url_google_secure_));
-  EXPECT_NE(net::OK, CanGetCookies(url_google_, url_google_mail_));
-  EXPECT_NE(net::OK, CanGetCookies(url_google_, url_google_analytics_));
-  EXPECT_NE(net::OK, CanGetCookies(url_google_, GURL()));
-
-  EXPECT_NE(net::OK, CanSetCookie(url_google_, url_google_));
-  EXPECT_NE(net::OK, CanSetCookie(url_google_, url_google_secure_));
-  EXPECT_NE(net::OK, CanSetCookie(url_google_, url_google_mail_));
-  EXPECT_NE(net::OK, CanSetCookie(url_google_, url_google_analytics_));
-  EXPECT_NE(net::OK, CanSetCookie(url_google_, GURL()));
+  SetPolicyType(StaticCookiePolicy::BLOCK_ALL_COOKIES);
+
+  EXPECT_NE(OK, CanGetCookies(url_google_, url_google_));
+  EXPECT_NE(OK, CanGetCookies(url_google_, url_google_secure_));
+  EXPECT_NE(OK, CanGetCookies(url_google_, url_google_mail_));
+  EXPECT_NE(OK, CanGetCookies(url_google_, url_google_analytics_));
+  EXPECT_NE(OK, CanGetCookies(url_google_, GURL()));
+
+  EXPECT_NE(OK, CanSetCookie(url_google_, url_google_));
+  EXPECT_NE(OK, CanSetCookie(url_google_, url_google_secure_));
+  EXPECT_NE(OK, CanSetCookie(url_google_, url_google_mail_));
+  EXPECT_NE(OK, CanSetCookie(url_google_, url_google_analytics_));
+  EXPECT_NE(OK, CanSetCookie(url_google_, GURL()));
 }
+
+}  // namespace net