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

net/base/cookie_store_test_helpers.h

 // 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.
 
 #ifndef NET_BASE_COOKIE_STORE_TEST_HELPERS_H_
 #define NET_BASE_COOKIE_STORE_TEST_HELPERS_H_
 #pragma once
 
 #include "net/base/cookie_monster.h"
 
@@ skipping 47 matching lines @@
                                  const std::string& cookie_name,
                                  const base::Closure& callback);
 
   virtual CookieMonster* GetCookieMonster();
 
  private:
 
   // Be called immediately from CookieMonster.
 
   void GetCookiesInternalCallback(
-      std::string* cookie_line,
-      std::vector<CookieStore::CookieInfo>* cookie_info);
+      const std::string& cookie_line,
+      const std::vector<CookieStore::CookieInfo>& cookie_info);
 
   void SetCookiesInternalCallback(bool result);
 
   void GetCookiesWithOptionsInternalCallback(std::string cookie);
 
   // Invoke the original callbacks.
 
   void InvokeGetCookiesCallback(
       const CookieMonster::GetCookieInfoCallback& callback);
 
@@ skipping 11 matching lines @@
   bool did_run_;
   bool result_;
   std::string cookie_;
   std::string cookie_line_;
   std::vector<CookieStore::CookieInfo> cookie_info_;
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_COOKIE_STORE_TEST_HELPERS_H_