6 files changed, 20 insertions, 22 deletions
diff --git a/webkit/child/fling_curve_configuration.cc b/content/child/fling_curve_configuration.cc
index 0705131..799511a 100644
--- a/webkit/child/fling_curve_configuration.cc
+++ b/content/child/fling_curve_configuration.cc
@@ -1,14 +1,14 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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/fling_curve_configuration.h"
+#include "content/child/fling_curve_configuration.h"
 
 #include "base/logging.h"
 #include "third_party/WebKit/public/platform/WebGestureCurve.h"
 #include "webkit/child/touch_fling_gesture_curve.h"
 
-namespace webkit_glue {
+namespace content {
 
 FlingCurveConfiguration::FlingCurveConfiguration() { }
 
@@ -37,7 +37,8 @@ blink::WebGestureCurve* FlingCurveConfiguration::CreateCore(
     p2 = coefs[2];
   }
 
-  return TouchFlingGestureCurve::Create(velocity, p0, p1, p2, cumulativeScroll);
+  return webkit_glue::TouchFlingGestureCurve::Create(velocity, p0, p1, p2,
+      cumulativeScroll);
 }
 
 blink::WebGestureCurve* FlingCurveConfiguration::CreateForTouchPad(
@@ -52,4 +53,4 @@ blink::WebGestureCurve* FlingCurveConfiguration::CreateForTouchScreen(
   return CreateCore(touchscreen_coefs_, velocity, cumulativeScroll);
 }
 
-} // namespace webkit_glue
+} // namespace content
diff --git a/webkit/child/fling_curve_configuration.h b/content/child/fling_curve_configuration.h
index 3ea954f..1a6573d 100644
--- a/webkit/child/fling_curve_configuration.h
+++ b/content/child/fling_curve_configuration.h
@@ -1,26 +1,25 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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_FLING_CURVE_CONFIGURATION_H_
-#define WEBKIT_CHILD_FLING_CURVE_CONFIGURATION_H_
+#ifndef CONTENT_CHILD_FLING_CURVE_CONFIGURATION_H_
+#define CONTENT_CHILD_FLING_CURVE_CONFIGURATION_H_
 
 #include <vector>
 
 #include "base/synchronization/lock.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
-#include "webkit/child/webkit_child_export.h"
 
 namespace blink {
 class WebGestureCurve;
 }
 
-namespace webkit_glue {
+namespace content {
 
 // A class to manage dynamically adjustable parameters controlling the
 // shape of the fling deacceleration function.
-class WEBKIT_CHILD_EXPORT FlingCurveConfiguration {
+class FlingCurveConfiguration {
  public:
   FlingCurveConfiguration();
   virtual ~FlingCurveConfiguration();
@@ -54,6 +53,6 @@ class WEBKIT_CHILD_EXPORT FlingCurveConfiguration {
   DISALLOW_COPY_AND_ASSIGN(FlingCurveConfiguration);
 };
 
-} // namespace webkit_glue
+} // namespace content
 
-#endif // WEBKIT_CHILD_FLING_CURVE_CONFIGURATION_H_
+#endif // CONTENT_CHILD_FLING_CURVE_CONFIGURATION_H_
diff --git a/content/child/webkitplatformsupport_child_impl.cc b/content/child/webkitplatformsupport_child_impl.cc
index 042e3f3..274e621 100644
--- a/content/child/webkitplatformsupport_child_impl.cc
+++ b/content/child/webkitplatformsupport_child_impl.cc
@@ -7,12 +7,12 @@
 #include "base/memory/discardable_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/waitable_event.h"
+#include "content/child/fling_curve_configuration.h"
 #include "content/child/web_discardable_memory_impl.h"
 #include "content/child/webthread_impl.h"
 #include "content/child/worker_task_runner.h"
 #include "third_party/WebKit/public/platform/WebWaitableEvent.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "webkit/child/fling_curve_configuration.h"
 
 #if defined(OS_ANDROID)
 #include "webkit/child/fling_animator_impl_android.h"
@@ -46,7 +46,7 @@ class WebWaitableEventImpl : public blink::WebWaitableEvent {
 
 WebKitPlatformSupportChildImpl::WebKitPlatformSupportChildImpl()
     : current_thread_slot_(&DestroyCurrentThread),
-      fling_curve_configuration_(new webkit_glue::FlingCurveConfiguration) {}
+      fling_curve_configuration_(new FlingCurveConfiguration) {}
 
 WebKitPlatformSupportChildImpl::~WebKitPlatformSupportChildImpl() {}
 
diff --git a/content/child/webkitplatformsupport_child_impl.h b/content/child/webkitplatformsupport_child_impl.h
index 6cc9f63..3093ec1 100644
--- a/content/child/webkitplatformsupport_child_impl.h
+++ b/content/child/webkitplatformsupport_child_impl.h
@@ -21,12 +21,10 @@
 #include "content/child/webthemeengine_impl_android.h"
 #endif
 
-namespace webkit_glue {
-class FlingCurveConfiguration;
-}
-
 namespace content {
 
+class FlingCurveConfiguration;
+
 class CONTENT_EXPORT WebKitPlatformSupportChildImpl :
     public webkit_glue::WebKitPlatformSupportImpl {
  public:
@@ -67,7 +65,7 @@ class CONTENT_EXPORT WebKitPlatformSupportChildImpl :
   WebThemeEngineImpl native_theme_engine_;
   WebFallbackThemeEngineImpl fallback_theme_engine_;
   base::ThreadLocalStorage::Slot current_thread_slot_;
-  scoped_ptr<webkit_glue::FlingCurveConfiguration> fling_curve_configuration_;
+  scoped_ptr<FlingCurveConfiguration> fling_curve_configuration_;
 };
 
 }  // namespace content
diff --git a/content/content_child.gypi b/content/content_child.gypi
index 71b06113..1af09da 100644
--- a/content/content_child.gypi
+++ b/content/content_child.gypi
@@ -53,6 +53,8 @@
     'child/fileapi/webfilewriter_base.h',
     'child/fileapi/webfilewriter_impl.cc',
     'child/fileapi/webfilewriter_impl.h',
+    'child/fling_curve_configuration.cc',
+    'child/fling_curve_configuration.h',
     'child/image_decoder.cc',
     'child/image_decoder.h',
     'child/indexed_db/indexed_db_dispatcher.cc',
diff --git a/webkit/child/webkit_child.gyp b/webkit/child/webkit_child.gyp
index bdd1833..93a68ab 100644
--- a/webkit/child/webkit_child.gyp
+++ b/webkit/child/webkit_child.gyp
@@ -58,8 +58,6 @@
       'sources': [
         'fling_animator_impl_android.cc',
         'fling_animator_impl_android.h',
-        'fling_curve_configuration.cc',
-        'fling_curve_configuration.h',
         'ftp_directory_listing_response_delegate.cc',
         'ftp_directory_listing_response_delegate.h',
         'multipart_response_delegate.cc',