roll rlz 130:132

content/public/common/url_fetcher.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_COMMON_URL_FETCHER_H_
 #define CONTENT_PUBLIC_COMMON_URL_FETCHER_H_
 #pragma once
 
 #include "content/common/content_export.h"
 
-// TODO(akalin): Remove this block once rlz is updated to use
-// url_fetcher.h from net/.
-#ifdef RLZ_LIB_FINANCIAL_PING_H_
-
-#include "net/url_request/url_fetcher.h"
-
-#endif
-
 class GURL;
 
 namespace net {
 class URLFetcher;
 }  // namespace
 
 namespace content {
 
-// TODO(akalin): Remove this block once rlz is updated to use
-// url_fetcher.h from net/.
-#ifdef RLZ_LIB_FINANCIAL_PING_H_
-
-namespace URLFetcher {
-
-CONTENT_EXPORT net::URLFetcher* Create(
-    const GURL& url,
-    net::URLFetcher::RequestType request_type,
-    net::URLFetcherDelegate* d);
-
-}  // namespace URLFetcher
-
-#endif  // RLZ_LIB_FINANCIAL_PING_H_
-
 // Mark URLRequests started by the URLFetcher to stem from the given render
 // view.
 CONTENT_EXPORT void AssociateURLFetcherWithRenderView(
     net::URLFetcher* url_fetcher,
     const GURL& first_party_for_cookies,
     int render_process_id,
     int render_view_id);
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_URL_FETCHER_H_