Remove is_prerender() from ChromeURLRequestUserData since it's not used anymore.

Also remove ChromeURLRequestUserData since no one else is using it.

BUG=304341
R=davidben@chromium.org

Review URL: https://codereview.chromium.org/124383008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243366 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

@@ -29,7 +29,6 @@
 #include "chrome/browser/prerender/prerender_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_io_data.h"
-#include "chrome/browser/renderer_host/chrome_url_request_user_data.h"
 #include "chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/signin/signin_header_helper.h"
@@ -247,12 +246,9 @@ void ChromeResourceDispatcherHostDelegate::RequestBeginning(
     int child_id,
     int route_id,
     ScopedVector<content::ResourceThrottle>* throttles) {
-  ChromeURLRequestUserData* user_data =
-      ChromeURLRequestUserData::Create(request);
   bool is_prerendering = prerender_tracker_->IsPrerenderingOnIOThread(
       child_id, route_id);
   if (is_prerendering) {
-    user_data->set_is_prerender(true);
     // Requests with the IGNORE_LIMITS flag set (i.e., sync XHRs)
     // should remain at MAXIMUM_PRIORITY.
     if (request->load_flags() & net::LOAD_IGNORE_LIMITS) {

chrome/browser/renderer_host/chrome_url_request_user_data.cc

-// Copyright (c) 2011 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 "chrome/browser/renderer_host/chrome_url_request_user_data.h"
-
-#include "net/url_request/url_request.h"
-
-namespace {
-
-const char* const kKeyName = "chrome_url_request_user_data";
-
-}  // namespace
-
-ChromeURLRequestUserData::ChromeURLRequestUserData()
-    : is_prerender_(false) {
-}
-
-// static
-ChromeURLRequestUserData* ChromeURLRequestUserData::Get(
-    const net::URLRequest* request) {
-  DCHECK(request);
-  return static_cast<ChromeURLRequestUserData*>(request->GetUserData(kKeyName));
-}
-
-// static
-ChromeURLRequestUserData* ChromeURLRequestUserData::Create(
-    net::URLRequest* request) {
-  DCHECK(request);
-  DCHECK(!Get(request));
-  ChromeURLRequestUserData* user_data = new ChromeURLRequestUserData();
-  request->SetUserData(kKeyName, user_data);
-  return user_data;
-}
-
-// static
-void ChromeURLRequestUserData::Delete(net::URLRequest* request) {
-  DCHECK(request);
-  request->SetUserData(kKeyName, NULL);
-}

chrome/browser/renderer_host/chrome_url_request_user_data.h

-// Copyright (c) 2011 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 CHROME_BROWSER_RENDERER_HOST_CHROME_URL_REQUEST_USER_DATA_H_
-#define CHROME_BROWSER_RENDERER_HOST_CHROME_URL_REQUEST_USER_DATA_H_
-
-#include "base/supports_user_data.h"
-
-namespace net {
-class URLRequest;
-}
-
-class ChromeURLRequestUserData : public base::SupportsUserData::Data {
- public:
-  bool is_prerender() const { return is_prerender_; }
-  void set_is_prerender(bool is_prerender) { is_prerender_ = is_prerender; }
-
-  // Creates a new ChromeURLRequestUserData instance and attaches it
-  // to |request|. |request| must not have an existing ChromeURLRequestUserData
-  // instance attached to it, and must be non-NULL. The returned instance
-  // is owned by |request|.
-  static ChromeURLRequestUserData* Create(net::URLRequest* request);
-
-  // Delete the ChromeURLRequestUserData from a |request|. |request| must be
-  // non-NULL.
-  static void Delete(net::URLRequest* request);
-
-  // Gets the ChromeURLRequestUserData instance attached to |request|, or
-  // returns NULL if one is not attached. |request| must be non-NULL.
-  static ChromeURLRequestUserData* Get(const net::URLRequest* request);
-
- private:
-  ChromeURLRequestUserData();
-
-  bool is_prerender_;
-
-  DISALLOW_COPY_AND_ASSIGN(ChromeURLRequestUserData);
-};
-
-#endif  // CHROME_BROWSER_RENDERER_HOST_CHROME_URL_REQUEST_USER_DATA_H_

chrome/browser/renderer_host/safe_browsing_resource_throttle.cc

@@ -7,7 +7,6 @@
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prerender/prerender_contents.h"
-#include "chrome/browser/renderer_host/chrome_url_request_user_data.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"

chrome/chrome_browser.gypi

@@ -1765,8 +1765,6 @@
         'browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.mm',
         'browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc',
         'browser/renderer_host/chrome_resource_dispatcher_host_delegate.h',
-        'browser/renderer_host/chrome_url_request_user_data.cc',
-        'browser/renderer_host/chrome_url_request_user_data.h',
         'browser/renderer_host/offline_resource_throttle.cc',
         'browser/renderer_host/offline_resource_throttle.h',
         'browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc',