Make AssociateWithRenderView() a free function in the 'content' namespace

content/common/net/url_fetcher_impl.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.
 
 #include "content/common/net/url_fetcher_impl.h"
 
 #include "base/bind.h"
 #include "base/message_loop_proxy.h"
 #include "content/common/net/url_fetcher_core.h"
 #include "content/common/net/url_request_user_data.h"
@@ skipping 22 matching lines @@
 // static
 void content::URLFetcher::CancelAll() {
   URLFetcherImpl::CancelAll();
 }
 
 // static
 void content::URLFetcher::SetEnableInterceptionForTests(bool enabled) {
   URLFetcherCore::SetEnableInterceptionForTests(enabled);
 }
 
+namespace {
+
+base::SupportsUserData::Data* CreateURLRequestUserData(
+    int render_process_id,
+    int render_view_id) {
+  return new URLRequestUserData(render_process_id, render_view_id);
+}
+
+}  // namespace
+
+namespace content {
+
+void AssociateURLFetcherWithRenderView(net::URLFetcher* url_fetcher,
+                                       const GURL& first_party_for_cookies,
+                                       int render_process_id,
+                                       int render_view_id) {
+  url_fetcher->SetFirstPartyForCookies(first_party_for_cookies);
+  url_fetcher->SetURLRequestUserData(
+      URLRequestUserData::kUserDataKey,
+      base::Bind(&CreateURLRequestUserData,
+                 render_process_id, render_view_id));
+}
+
+}  // namespace content
 
 URLFetcherImpl::URLFetcherImpl(const GURL& url,
                                RequestType request_type,
                                content::URLFetcherDelegate* d)
     : ALLOW_THIS_IN_INITIALIZER_LIST(
         core_(new content::URLFetcherCore(this, url, request_type, d))) {
 }
 
 URLFetcherImpl::~URLFetcherImpl() {
   core_->Stop();
@@ skipping 38 matching lines @@
 void URLFetcherImpl::GetExtraRequestHeaders(
     net::HttpRequestHeaders* headers) const {
   GetExtraRequestHeaders(headers);
 }
 
 void URLFetcherImpl::SetRequestContext(
     net::URLRequestContextGetter* request_context_getter) {
   core_->SetRequestContext(request_context_getter);
 }
 
-namespace {
-
-base::SupportsUserData::Data* CreateURLRequestUserData(
-    int render_process_id,
-    int render_view_id) {
-  return new URLRequestUserData(render_process_id, render_view_id);
+void URLFetcherImpl::SetFirstPartyForCookies(
+    const GURL& first_party_for_cookies) {
+  core_->SetFirstPartyForCookies(first_party_for_cookies);
 }
 
-}  // namespace
-
-void URLFetcherImpl::AssociateWithRenderView(
-    const GURL& first_party_for_cookies,
-    int render_process_id,
-    int render_view_id) {
-  core_->SetFirstPartyForCookies(first_party_for_cookies);
-  core_->SetURLRequestUserData(
-      URLRequestUserData::kUserDataKey,
-      base::Bind(&CreateURLRequestUserData,
-                 render_process_id, render_view_id));
+void URLFetcherImpl::SetURLRequestUserData(
+    const void* key,
+    const CreateDataCallback& create_data_callback) {
+  core_->SetURLRequestUserData(key, create_data_callback);
 }
 
 void URLFetcherImpl::SetAutomaticallyRetryOn5xx(bool retry) {
   core_->SetAutomaticallyRetryOn5xx(retry);
 }
 
 void URLFetcherImpl::SetMaxRetries(int max_retries) {
   core_->SetMaxRetries(max_retries);
 }
 
@@ skipping 89 matching lines @@
 
 // static
 content::URLFetcherFactory* URLFetcherImpl::factory() {
   return g_factory;
 }
 
 // static
 void URLFetcherImpl::set_factory(content::URLFetcherFactory* factory) {
   g_factory = factory;
 }