Re-land http://codereview.chromium.org/7831056/ and http://codereview.chromium.org/7833042/ .

net/base/cookie_store_test_helpers.cc

 // 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.
 
 #include "net/base/cookie_store_test_helpers.h"
 
 #include "base/message_loop.h"
 
 namespace net {
 
 const int kDelayedTime = 0;
 
 DelayedCookieMonster::DelayedCookieMonster()
       : cookie_monster_(new CookieMonster(NULL, NULL)),
         did_run_(false),
         result_(false) {
 }
 
 DelayedCookieMonster::~DelayedCookieMonster() {
 }
 
 void DelayedCookieMonster::GetCookiesInternalCallback(
-    std::string* cookie_line,
-    std::vector<CookieStore::CookieInfo>* cookie_info) {
-  cookie_line_ = *cookie_line;
-  cookie_info_ = *cookie_info;
+    const std::string& cookie_line,
+    const std::vector<CookieStore::CookieInfo>& cookie_info) {
+  cookie_line_ = cookie_line;
+  cookie_info_ = cookie_info;
   did_run_ = true;
 }
 
 void DelayedCookieMonster::SetCookiesInternalCallback(bool result) {
   result_ = result;
   did_run_ = true;
 }
 
 void DelayedCookieMonster::GetCookiesWithOptionsInternalCallback(
     std::string cookie) {
@@ skipping 47 matching lines @@
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&DelayedCookieMonster::InvokeGetCookieStringCallback,
                  base::Unretained(this), callback),
       kDelayedTime);
 }
 
 void DelayedCookieMonster::InvokeGetCookiesCallback(
     const CookieMonster::GetCookieInfoCallback& callback) {
   if (!callback.is_null())
-    callback.Run(&cookie_line_, &cookie_info_);
+    callback.Run(cookie_line_, cookie_info_);
 }
 
 void DelayedCookieMonster::InvokeSetCookiesCallback(
     const CookieMonster::SetCookiesCallback& callback) {
   if (!callback.is_null())
     callback.Run(result_);
 }
 
 void DelayedCookieMonster::InvokeGetCookieStringCallback(
     const CookieMonster::GetCookiesCallback& callback) {
@@ skipping 33 matching lines @@
                                              const std::string& cookie_name,
                                              const base::Closure& callback) {
   ADD_FAILURE();
 }
 
 CookieMonster* DelayedCookieMonster::GetCookieMonster() {
   return cookie_monster_;
 }
 
 }  // namespace net