Use WeakPtr and do not use pointer equality in WebURLLoaderMockFactory

content/test/weburl_loader_mock.cc

 // Copyright 2013 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 "content/test/weburl_loader_mock.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/child/web_url_loader_impl.h"
 #include "content/test/weburl_loader_mock_factory.h"
@@ skipping 28 matching lines @@
   // If no delegate is provided then create an empty one. The default behavior
   // will just proxy to the client.
   scoped_ptr<blink::WebURLLoaderTestDelegate> defaultDelegate;
   if (!delegate) {
     defaultDelegate.reset(new blink::WebURLLoaderTestDelegate());
     delegate = defaultDelegate.get();
   }
 
   // didReceiveResponse() and didReceiveData() might end up getting ::cancel()
   // to be called which will make the ResourceLoader to delete |this|.
-  base::WeakPtr<WebURLLoaderMock> self(weak_factory_.GetWeakPtr());
+  base::WeakPtr<WebURLLoaderMock> self(GetWeakPtr());
 
   delegate->didReceiveResponse(client_, this, response);
   if (!self)
     return;
 
   if (error.reason) {
     delegate->didFail(client_, this, error);
     return;
   }
   delegate->didReceiveData(client_, this, data.data(), data.size(),
@@ skipping 17 matching lines @@
 
   blink::WebURLRequest newRequest;
   newRequest.initialize();
   content::WebURLLoaderImpl::PopulateURLRequestForRedirect(
       request,
       redirectInfo,
       request.referrerPolicy(),
       request.skipServiceWorker(),
       &newRequest);
 
-  base::WeakPtr<WebURLLoaderMock> self(weak_factory_.GetWeakPtr());
+  base::WeakPtr<WebURLLoaderMock> self(GetWeakPtr());
 
   client_->willFollowRedirect(this, newRequest, redirectResponse);
 
   // |this| might be deleted in willFollowRedirect().
   if (!self)
     return newRequest;
 
   if (redirectURL != GURL(newRequest.url())) {
     // Only follow the redirect if WebKit left the URL unmodified.
     // We assume that WebKit only changes the URL to suppress a redirect, and we
@@ skipping 15 matching lines @@
   }
   DCHECK(static_cast<const GURL&>(request.url()).SchemeIs("data"))
       << "loadSynchronously shouldn't be falling back: "
       << request.url().string().utf8();
   using_default_loader_ = true;
   default_loader_->loadSynchronously(request, response, error, data);
 }
 
 void WebURLLoaderMock::loadAsynchronously(const blink::WebURLRequest& request,
                                           blink::WebURLLoaderClient* client) {
+  CHECK(client);
   if (factory_->IsMockedURL(request.url())) {
     client_ = client;
     factory_->LoadAsynchronouly(request, this);
     return;
   }
   DCHECK(static_cast<const GURL&>(request.url()).SchemeIs("data"))
       << "loadAsynchronously shouldn't be falling back: "
       << request.url().string().utf8();
   using_default_loader_ = true;
   default_loader_->loadAsynchronously(request, client);
@@ skipping 14 matching lines @@
     default_loader_->setDefersLoading(deferred);
     return;
   }
   NOTIMPLEMENTED();
 }
 
 void WebURLLoaderMock::setLoadingTaskRunner(blink::WebTaskRunner*) {
   // In principle this is NOTIMPLEMENTED(), but if we put that here it floods
   // the console during webkit unit tests, so we leave the function empty.
 }
+
+base::WeakPtr<WebURLLoaderMock> WebURLLoaderMock::GetWeakPtr() {
+  return weak_factory_.GetWeakPtr();
+}