Merge weburlrequest_extradata_impl.cc/h into content/child/request_extra_data.cc/h. Change to empty constructor and use individual setters for each value.

BUG=338338
TBR=darin@chromium.org

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

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

3 files changed, 0 insertions, 67 deletions

diff --git a/webkit/child/webkit_child.gyp b/webkit/child/webkit_child.gyp
index 1d3c0d9..598d082d 100644
--- a/webkit/child/webkit_child.gyp
+++ b/webkit/child/webkit_child.gyp
@@ -61,8 +61,6 @@
         'touch_fling_gesture_curve.cc',
         'touch_fling_gesture_curve.h',
         'webkit_child_export.h',
-        'weburlrequest_extradata_impl.cc',
-        'weburlrequest_extradata_impl.h',
         'weburlresponse_extradata_impl.cc',
         'weburlresponse_extradata_impl.h',
       ],
diff --git a/webkit/child/weburlrequest_extradata_impl.cc b/webkit/child/weburlrequest_extradata_impl.cc
deleted file mode 100644
index 8eed5e1..0000000
--- a/webkit/child/weburlrequest_extradata_impl.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-// 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 "webkit/child/weburlrequest_extradata_impl.h"
-
-using blink::WebString;
-
-namespace webkit_glue {
-
-WebURLRequestExtraDataImpl::WebURLRequestExtraDataImpl(
-    const WebString& custom_user_agent,
-    bool was_after_preconnect_request)
-    : custom_user_agent_(custom_user_agent),
-      was_after_preconnect_request_(was_after_preconnect_request) {
-}
-
-WebURLRequestExtraDataImpl::~WebURLRequestExtraDataImpl() {
-}
-
-}  // namespace webkit_glue
diff --git a/webkit/child/weburlrequest_extradata_impl.h b/webkit/child/weburlrequest_extradata_impl.h
deleted file mode 100644
index 797a232..0000000
--- a/webkit/child/weburlrequest_extradata_impl.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// 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 WEBKIT_CHILD_WEBURLREQUEST_EXTRADATA_IMPL_H_
-#define WEBKIT_CHILD_WEBURLREQUEST_EXTRADATA_IMPL_H_
-
-#include "base/compiler_specific.h"
-#include "third_party/WebKit/public/platform/WebString.h"
-#include "third_party/WebKit/public/platform/WebURLRequest.h"
-#include "webkit/child/webkit_child_export.h"
-
-namespace webkit_glue {
-
-// Base class for Chrome's implementation of the "extra data" stored in each
-// ResourceRequest.
-class WEBKIT_CHILD_EXPORT WebURLRequestExtraDataImpl :
-    public NON_EXPORTED_BASE(blink::WebURLRequest::ExtraData) {
- public:
-  // |custom_user_agent| is used to communicate an overriding custom user agent
-  // to |RenderViewImpl::willSendRequest()|; set to a null string to indicate no
-  // override and an empty string to indicate that there should be no user
-  // agent. This needs to be here, instead of content's |RequestExtraData| since
-  // ppb_url_request_info_impl.cc needs to be able to set it.
-  explicit WebURLRequestExtraDataImpl(
-      const blink::WebString& custom_user_agent,
-      bool was_after_preconnect_request);
-  virtual ~WebURLRequestExtraDataImpl();
-
-  const blink::WebString& custom_user_agent() const {
-    return custom_user_agent_;
-  }
-  bool was_after_preconnect_request() { return was_after_preconnect_request_; }
-
- private:
-  blink::WebString custom_user_agent_;
-  bool was_after_preconnect_request_;
-
-  DISALLOW_COPY_AND_ASSIGN(WebURLRequestExtraDataImpl);
-};
-
-}  // namespace webkit_glue
-
-#endif  // WEBKIT_CHILD_WEBURLREQUEST_EXTRADATA_IMPL_H_