Adjust URLFetcher::Create API so that object is returned as scoped_ptr.

google_apis/gaia/oauth2_access_token_fetcher_impl_unittest.cc

 // Copyright 2014 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.
 //
 // A complete set of unit tests for OAuth2AccessTokenFetcherImpl.
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
@@ skipping 43 matching lines @@
     "{"
     "  \"error\": \"invalid_grant\""
     "}";
 
 class MockUrlFetcherFactory : public ScopedURLFetcherFactory,
                               public URLFetcherFactory {
  public:
   MockUrlFetcherFactory() : ScopedURLFetcherFactory(this) {}
   virtual ~MockUrlFetcherFactory() {}
 
-  MOCK_METHOD4(CreateURLFetcher,
+  MOCK_METHOD4(CreateURLFetcherMock,
                URLFetcher*(int id,
                            const GURL& url,
                            URLFetcher::RequestType request_type,
                            URLFetcherDelegate* d));
+
+  scoped_ptr<URLFetcher> CreateURLFetcher(int id,
+                                          const GURL& url,
+                                          URLFetcher::RequestType request_type,
+                                          URLFetcherDelegate* d) override {
+    return scoped_ptr<URLFetcher>(
+        CreateURLFetcherMock(id, url, request_type, d));
+  }
 };
 
 class MockOAuth2AccessTokenConsumer : public OAuth2AccessTokenConsumer {
  public:
   MockOAuth2AccessTokenConsumer() {}
   ~MockOAuth2AccessTokenConsumer() {}
 
   MOCK_METHOD2(OnGetTokenSuccess,
                void(const std::string& access_token,
                     const base::Time& expiration_time));
@@ skipping 21 matching lines @@
     URLRequestStatus::Status status =
         fetch_succeeds ? URLRequestStatus::SUCCESS : URLRequestStatus::FAILED;
     url_fetcher->set_status(URLRequestStatus(status, 0));
 
     if (response_code != 0)
       url_fetcher->set_response_code(response_code);
 
     if (!body.empty())
       url_fetcher->SetResponseString(body);
 
-    EXPECT_CALL(factory_, CreateURLFetcher(_, url, _, _))
+    EXPECT_CALL(factory_, CreateURLFetcherMock(_, url, _, _))
         .WillOnce(Return(url_fetcher));
     return url_fetcher;
   }
 
  protected:
   base::MessageLoop message_loop_;
   MockUrlFetcherFactory factory_;
   MockOAuth2AccessTokenConsumer consumer_;
   scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_;
   OAuth2AccessTokenFetcherImpl fetcher_;
@@ skipping 135 matching lines @@
     TestURLFetcher url_fetcher(0, GURL("http://www.google.com"), NULL);
     url_fetcher.SetResponseString(kValidFailureTokenResponse);
 
     std::string error;
     EXPECT_TRUE(
         OAuth2AccessTokenFetcherImpl::ParseGetAccessTokenFailureResponse(
             &url_fetcher, &error));
     EXPECT_EQ("invalid_grant", error);
   }
 }