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

google_apis/gaia/oauth2_api_call_flow_unittest.cc

 // Copyright (c) 2012 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 OAuth2MintTokenFlow.
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 43 matching lines @@
 // Replaces the global URLFetcher factory so the test can return a custom
 // URLFetcher to complete requests.
 class MockUrlFetcherFactory : public ScopedURLFetcherFactory,
                               public URLFetcherFactory {
  public:
   MockUrlFetcherFactory()
       : ScopedURLFetcherFactory(this) {
   }
   virtual ~MockUrlFetcherFactory() {}
 
-  MOCK_METHOD4(
-      CreateURLFetcher,
-      URLFetcher* (int id,
-                   const GURL& url,
-                   URLFetcher::RequestType request_type,
-                   URLFetcherDelegate* d));
+  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 MockApiCallFlow : public OAuth2ApiCallFlow {
  public:
   MockApiCallFlow() {}
   ~MockApiCallFlow() {}
 
   MOCK_METHOD0(CreateApiCallUrl, GURL ());
   MOCK_METHOD0(CreateApiCallBody, std::string ());
   MOCK_METHOD1(ProcessApiCallSuccess,
@@ skipping 31 matching lines @@
     return url_fetcher;
   }
 
   TestURLFetcher* SetupApiCall(bool succeeds, net::HttpStatusCode status) {
     std::string body(CreateBody());
     GURL url(CreateApiUrl());
     EXPECT_CALL(flow_, CreateApiCallBody()).WillOnce(Return(body));
     EXPECT_CALL(flow_, CreateApiCallUrl()).WillOnce(Return(url));
     TestURLFetcher* url_fetcher =
         CreateURLFetcher(url, succeeds, status, std::string());
-    EXPECT_CALL(factory_, CreateURLFetcher(_, url, _, _))
+    EXPECT_CALL(factory_, CreateURLFetcherMock(_, url, _, _))
         .WillOnce(Return(url_fetcher));
     return url_fetcher;
   }
 
   base::MessageLoop message_loop_;
   scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_;
   StrictMock<MockApiCallFlow> flow_;
   MockUrlFetcherFactory factory_;
 };
 
@@ skipping 25 matching lines @@
   TestURLFetcher* url_fetcher = SetupApiCall(true, net::HTTP_OK);
   flow_.Start(request_context_getter_.get(), kAccessToken);
   HttpRequestHeaders headers;
   url_fetcher->GetExtraRequestHeaders(&headers);
   std::string auth_header;
   EXPECT_TRUE(headers.GetHeader("Authorization", &auth_header));
   EXPECT_EQ("Bearer access_token", auth_header);
   EXPECT_EQ(url, url_fetcher->GetOriginalURL());
   EXPECT_EQ(body, url_fetcher->upload_data());
 }