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

This reverts commit e59558b78e8c6a1b0bd916a724724b638c3c91b6.

Revert "Fix build after r193020."

This reverts commit 558a35897f6b3ffbcaefde927c1f150b815d140a.

Revert "Really fix build after r193020."

This reverts commit e3748a79b523a8d365d4a33ef986eebb4186fa78.

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

1 files changed, 7 insertions, 21 deletions

diff --git a/chrome/browser/extensions/api/cookies/cookies_unittest.cc b/chrome/browser/extensions/api/cookies/cookies_unittest.cc
index 0844b83..f1bd93d 100644
--- a/chrome/browser/extensions/api/cookies/cookies_unittest.cc
+++ b/chrome/browser/extensions/api/cookies/cookies_unittest.cc
@@ -195,36 +195,22 @@ TEST_F(ExtensionCookiesTest, DomainMatching) {
     scoped_ptr<GetAll::Params> params(GetAll::Params::Create(args));
 
     cookies_helpers::MatchFilter filter(&params->details);
-    net::CanonicalCookie cookie(GURL(),
-                                std::string(),
-                                std::string(),
-                                tests[i].domain,
-                                std::string(),
-                                base::Time(),
-                                base::Time(),
-                                base::Time(),
-                                false,
-                                false);
+    net::CanonicalCookie cookie(GURL(), "", "", tests[i].domain,"",
+                                base::Time(), base::Time(), base::Time(),
+                                false, false);
     EXPECT_EQ(tests[i].matches, filter.MatchesCookie(cookie));
   }
 }
 
 TEST_F(ExtensionCookiesTest, DecodeUTF8WithErrorHandling) {
-  net::CanonicalCookie canonical_cookie(GURL(),
-                                        std::string(),
-                                        "011Q255bNX_1!yd\203e+",
-                                        "test.com",
-                                        "/path\203",
-                                        base::Time(),
-                                        base::Time(),
-                                        base::Time(),
-                                        false,
-                                        false);
+  net::CanonicalCookie canonical_cookie(
+      GURL(), "", "011Q255bNX_1!yd\203e+", "test.com", "/path\203",
+      base::Time(), base::Time(), base::Time(), false, false);
   scoped_ptr<Cookie> cookie(
       cookies_helpers::CreateCookie(
           canonical_cookie, "some cookie store"));
   EXPECT_EQ(std::string("011Q255bNX_1!yd\xEF\xBF\xBD" "e+"), cookie->value);
-  EXPECT_EQ(std::string(), cookie->path);
+  EXPECT_EQ(std::string(""), cookie->path);
 }
 
 }  // namespace extensions