android: Use UIResource for overscroll glow

content/browser/android/ui_resource_provider_impl.h

Index: content/browser/android/ui_resource_provider_impl.h
diff --git a/content/browser/android/ui_resource_provider_impl.h b/content/browser/android/ui_resource_provider_impl.h
index 79c23014d2d3735554d68a447ca7e44cc500617c..7888b2d2cebabd55557fa0dd8bca3a4d4a034bb8 100644
--- a/content/browser/android/ui_resource_provider_impl.h
+++ b/content/browser/android/ui_resource_provider_impl.h
@@ -6,17 +6,19 @@
 #define CONTENT_BROWSER_ANDROID_UI_RESOURCE_PROVIDER_IMPL_H_
 
 #include "base/containers/hash_tables.h"
-#include "content/public/browser/android/ui_resource_provider.h"
+#include "ui/base/android/ui_resource_provider.h"
 
 namespace cc {
 class LayerTreeHost;
 }
 
-namespace content {
-
+namespace ui {
 class UIResourceClientAndroid;
+}
+
+namespace content {
 
-class UIResourceProviderImpl : public UIResourceProvider {
+class UIResourceProviderImpl : public ui::UIResourceProvider {
  public:
   UIResourceProviderImpl();
 
@@ -27,12 +29,12 @@ class UIResourceProviderImpl : public UIResourceProvider {
   void UIResourcesAreInvalid();
 
   virtual cc::UIResourceId CreateUIResource(
-      UIResourceClientAndroid* client) OVERRIDE;
+      ui::UIResourceClientAndroid* client) OVERRIDE;
 
   virtual void DeleteUIResource(cc::UIResourceId resource_id) OVERRIDE;
 
  private:
-  typedef base::hash_map<cc::UIResourceId, UIResourceClientAndroid*>
+  typedef base::hash_map<cc::UIResourceId, ui::UIResourceClientAndroid*>
       UIResourceClientMap;
   UIResourceClientMap ui_resource_client_map_;