Update from https://crrev.com/314320

net/cookies/cookie_util_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 <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "net/cookies/cookie_util.h"
@@ skipping 25 matching lines @@
 }
 
 void CheckSerialize(
     const std::vector<std::pair<std::string, std::string> >& parsed,
     const std::string& str_expected) {
   net::cookie_util::ParsedRequestCookies prc =
       MakeParsedRequestCookies(parsed);
   EXPECT_EQ(str_expected, net::cookie_util::SerializeRequestCookieLine(prc));
 }
 
-} // namespace
-
 TEST(CookieUtilTest, TestDomainIsHostOnly) {
   const struct {
     const char* str;
     const bool is_host_only;
   } tests[] = {
     { "",               true },
     { "www.google.com", true },
     { ".google.com",    false }
   };
 
@@ skipping 129 matching lines @@
                                                std::string("\"abcdef\"")));
   tests.back().parsed.push_back(std::make_pair(std::string("otherkey"),
                                                std::string("1234")));
 
   for (size_t i = 0; i < tests.size(); i++) {
     SCOPED_TRACE(testing::Message() << "Test " << i);
     CheckParse(tests[i].str, tests[i].parsed);
     CheckSerialize(tests[i].parsed, tests[i].str);
   }
 }
+
+TEST(CookieUtilTest, TestGetEffectiveDomain) {
+  // Note: registry_controlled_domains::GetDomainAndRegistry is tested in its
+  // own unittests.
+  EXPECT_EQ("example.com",
+            net::cookie_util::GetEffectiveDomain("http", "www.example.com"));
+  EXPECT_EQ("example.com",
+            net::cookie_util::GetEffectiveDomain("https", "www.example.com"));
+  EXPECT_EQ("example.com",
+            net::cookie_util::GetEffectiveDomain("ws", "www.example.com"));
+  EXPECT_EQ("example.com",
+            net::cookie_util::GetEffectiveDomain("wss", "www.example.com"));
+  EXPECT_EQ("www.example.com",
+            net::cookie_util::GetEffectiveDomain("ftp", "www.example.com"));
+}
+
+}  // namespace