GetEffectiveDomain should handle ws scheme as same as http scheme.

net/cookies/cookie_monster_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/cookies/cookie_store_unittest.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 2593 matching lines @@
   it = cookies.begin();
   base::Closure task = base::Bind(
       &net::MultiThreadedCookieMonsterTest::DeleteCanonicalCookieTask,
       base::Unretained(this),
       cm, *it, &callback);
   RunOnOtherThread(task);
   EXPECT_TRUE(callback.did_run());
   EXPECT_TRUE(callback.result());
 }
 
+TEST_F(MultiThreadedCookieMonsterTest, GetAllCookiesForURLEffectiveDomain) {
+  std::vector<CanonicalCookie*> cookies;
+  // This cookie is freed by the CookieMonster.

[Ryan Sleevi, 2015/01/22 01:43:41]

is? or will be?

[yhirano, 2015/01/23 03:34:36]

Done.

+  cookies.push_back(CanonicalCookie::Create(url_google_, kValidCookieLine,
+                                            Time::Now(), CookieOptions()));
+  CanonicalCookie cookie = *cookies[0];

[Ryan Sleevi, 2015/01/22 01:43:41]

Did you mean to copy? If so, why?

[yhirano, 2015/01/23 03:34:36]

I want to have a cookie to verify the result below. I don't want to have a raw
pointer which can be destructed by the CookiMonster at any time.

+  scoped_refptr<NewMockPersistentCookieStore> store(
+      new NewMockPersistentCookieStore);
+  scoped_refptr<CookieMonster> cm(new CookieMonster(store.get(), NULL));
+
+  CookieMonster::PersistentCookieStore::LoadedCallback loaded_callback;
+  ::testing::StrictMock<::testing::MockFunction<void(int)>> checkpoint;

[Ryan Sleevi, 2015/01/22 01:43:41]

This seems unnecessary/overkill. The relation of checkpoint to the rest of this
test is not at all obvious.

[yhirano, 2015/01/23 03:34:36]

I want to check that all monitored calls happens between the checkpoint calls.

+  const std::string key = "google.izzle";

[Ryan Sleevi, 2015/01/22 01:43:41]

What is this magic string and why are you using it?

[yhirano, 2015/01/23 03:34:36]

Done.

+
+  {
+    ::testing::InSequence s;
+    EXPECT_CALL(checkpoint, Call(0));
+    EXPECT_CALL(*store, Load(::testing::_));
+    EXPECT_CALL(*store, LoadCookiesForKey(key, ::testing::_))
+        .WillOnce(::testing::SaveArg<1>(&loaded_callback));
+    EXPECT_CALL(checkpoint, Call(1));
+    // LoadCookiesForKey will never be called, because they share the same key.
+  }
+
+  checkpoint.Call(0);
+  {
+    GetCookieListCallback callback;
+    GetAllCookiesForURLTask(cm.get(), url_google_, &callback);
+    checkpoint.Call(1);
+    EXPECT_FALSE(callback.did_run());
+    loaded_callback.Run(cookies);

[Ryan Sleevi, 2015/01/22 01:43:41]

This is a bit surprising and non-obvious. Needs better documentation, but I
wonder if this can't be eliminated entirely.

[yhirano, 2015/01/23 03:34:36]

It is necessary. By calling loaded_callback, we notify the CookieMonster that
LoadCookiesForKey task is done.

+    EXPECT_TRUE(callback.did_run());
+    ASSERT_EQ(1u, callback.cookies().size());
+    EXPECT_TRUE(cookie.IsEquivalent(callback.cookies()[0]));
+  }
+  {
+    GetCookieListCallback callback;
+    GetAllCookiesForURLTask(cm.get(), url_google_, &callback);
+    EXPECT_TRUE(callback.did_run());
+    ASSERT_EQ(1u, callback.cookies().size());
+    EXPECT_TRUE(cookie.IsEquivalent(callback.cookies()[0]));
+  }
+  {
+    GetCookieListCallback callback;
+    GetAllCookiesForURLTask(cm.get(), url_google_secure_, &callback);
+    EXPECT_TRUE(callback.did_run());
+    ASSERT_EQ(1u, callback.cookies().size());
+    EXPECT_TRUE(cookie.IsEquivalent(callback.cookies()[0]));
+  }
+  {
+    GetCookieListCallback callback;
+    GetAllCookiesForURLTask(cm.get(), GURL(kUrlGoogleWebSocket), &callback);
+    EXPECT_TRUE(callback.did_run());
+    ASSERT_EQ(1u, callback.cookies().size());
+    EXPECT_TRUE(cookie.IsEquivalent(callback.cookies()[0]));
+  }
+  {
+    GetCookieListCallback callback;
+    GetAllCookiesForURLTask(cm.get(), GURL(kUrlGoogleWebSocketSecure),
+                            &callback);
+    EXPECT_TRUE(callback.did_run());
+    ASSERT_EQ(1u, callback.cookies().size());
+    EXPECT_TRUE(cookie.IsEquivalent(callback.cookies()[0]));
+  }

[Ryan Sleevi, 2015/01/22 01:43:41]

The documentation for each of these assertions is very poor, and it's not easy
to read what the test is testing. Please document, in a single sentence, the
assertions being made here.

[yhirano, 2015/01/23 03:34:36]

Done.

+}
+
 TEST_F(CookieMonsterTest, InvalidExpiryTime) {
   std::string cookie_line =
       std::string(kValidCookieLine) + "; expires=Blarg arg arg";
   scoped_ptr<CanonicalCookie> cookie(
       CanonicalCookie::Create(url_google_, cookie_line, Time::Now(),
                               CookieOptions()));
   ASSERT_FALSE(cookie->IsPersistent());
 }
 
 // Test that CookieMonster writes session cookies into the underlying
@@ skipping 255 matching lines @@
   scoped_ptr<CookieStore::CookieChangedSubscription> sub1(
       monster()->AddCallbackForCookie(test_url_, "abc",
           base::Bind(&RecordCookieChanges, &cookies1, nullptr)));
   SetCookie(monster(), test_url_, "abc=def");
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(1U, cookies0.size());
   EXPECT_EQ(1U, cookies0.size());
 }
 
 }  // namespace net