Use an explicit boolean has_new_first_party_for_cookies instead...

webkit/tools/test_shell/simple_resource_loader_bridge.cc

 // Copyright (c) 2006-2008 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.
 //
 // This file contains an implementation of the ResourceLoaderBridge class.
 // The class is implemented using URLRequest, meaning it is a "simple" version
 // that directly issues requests. The more complicated one used in the
 // browser uses IPC.
 //
 // Because URLRequest only provides an asynchronous resource loading API, this
@@ skipping 135 matching lines @@
            MessageLoop::current() == io_thread->message_loop());
   }
 
   // --------------------------------------------------------------------------
   // The following methods are called on the owner's thread in response to
   // various URLRequest callbacks.  The event hooks, defined below, trigger
   // these methods asynchronously.
 
   void NotifyReceivedRedirect(const GURL& new_url,
                               const ResourceLoaderBridge::ResponseInfo& info) {
+    bool has_new_first_party_for_cookies = false;
     GURL new_first_party_for_cookies;
     if (peer_ && peer_->OnReceivedRedirect(new_url, info,
+                                           &has_new_first_party_for_cookies,
                                            &new_first_party_for_cookies)) {
       io_thread->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(
           this, &RequestProxy::AsyncFollowDeferredRedirect,
-          new_first_party_for_cookies));
+          has_new_first_party_for_cookies, new_first_party_for_cookies));
     } else {
       Cancel();
     }
   }
 
   void NotifyReceivedResponse(const ResourceLoaderBridge::ResponseInfo& info,
                               bool content_filtered) {
     if (peer_)
       peer_->OnReceivedResponse(info, content_filtered);
   }
@@ skipping 62 matching lines @@
 
   void AsyncCancel() {
     // This can be null in cases where the request is already done.
     if (!request_.get())
       return;
 
     request_->Cancel();
     Done();
   }
 
-  void AsyncFollowDeferredRedirect(const GURL& new_first_party_for_cookies) {
+  void AsyncFollowDeferredRedirect(bool has_new_first_party_for_cookies,
+                                   const GURL& new_first_party_for_cookies) {
     // This can be null in cases where the request is already done.
     if (!request_.get())
       return;
 
-    if (!new_first_party_for_cookies.is_empty())
+    if (has_new_first_party_for_cookies)
       request_->set_first_party_for_cookies(new_first_party_for_cookies);
     request_->FollowDeferredRedirect();
   }
 
   void AsyncReadData() {
     // This can be null in cases where the request is already done.
     if (!request_.get())
       return;
 
     if (request_->status().is_success()) {
@@ skipping 481 matching lines @@
   options.message_loop_type = MessageLoop::TYPE_IO;
   return io_thread->StartWithOptions(options);
 }
 
 // static
 void SimpleResourceLoaderBridge::SetAcceptAllCookies(bool accept_all_cookies) {
   CookiePolicy::Type policy_type = accept_all_cookies ?
       CookiePolicy::ALLOW_ALL_COOKIES : CookiePolicy::BLOCK_THIRD_PARTY_COOKIES;
   request_context->cookie_policy()->set_type(policy_type);
 }