Replace SystemUIResourceManager with ResourceManager

content/browser/android/overscroll_refresh.cc

Index: content/browser/android/overscroll_refresh.cc
diff --git a/content/browser/android/overscroll_refresh.cc b/content/browser/android/overscroll_refresh.cc
index fefc4295adc0b5d5a641e74d3e42c55b7cf12149..3183eef55aacda8b31343cc129e1ea0d73e0250a 100644
--- a/content/browser/android/overscroll_refresh.cc
+++ b/content/browser/android/overscroll_refresh.cc
@@ -8,7 +8,7 @@
 #include "cc/layers/ui_resource_layer.h"
 #include "cc/trees/layer_tree_host.h"
 #include "content/browser/android/animation_utils.h"
-#include "ui/base/android/system_ui_resource_manager.h"
+#include "ui/android/resources/resource_manager.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
 using std::abs;
@@ -18,8 +18,8 @@ using std::min;
 namespace content {
 namespace {
 
-const ui::SystemUIResourceType kIdleResourceType = ui::OVERSCROLL_REFRESH_IDLE;
-const ui::SystemUIResourceType kActiveResourceType =
+const ui::SystemUIResourceType kIdleResourceId = ui::OVERSCROLL_REFRESH_IDLE;
+const ui::SystemUIResourceType kActiveResourceId =
     ui::OVERSCROLL_REFRESH_ACTIVE;
 
 // Drag movement multiplier between user input and effect translation.
@@ -105,7 +105,7 @@ void UpdateLayer(cc::UIResourceLayer* layer,
 
 class OverscrollRefresh::Effect {
  public:
-  Effect(ui::SystemUIResourceManager* resource_manager, float target_drag)
+  Effect(ui::ResourceManager* resource_manager, float target_drag)
       : resource_manager_(resource_manager),
         idle_layer_(cc::UIResourceLayer::Create()),
         active_layer_(cc::UIResourceLayer::Create()),
@@ -325,10 +325,10 @@ class OverscrollRefresh::Effect {
       return;
     }
 
-    cc::UIResourceId idle_resource =
-        resource_manager_->GetUIResourceId(kIdleResourceType);
-    cc::UIResourceId active_resource =
-        resource_manager_->GetUIResourceId(kActiveResourceType);
+    cc::UIResourceId idle_resource = resource_manager_->GetUIResourceId(
+        ui::ANDROID_RESOURCE_TYPE_SYSTEM, kIdleResourceId);
+    cc::UIResourceId active_resource = resource_manager_->GetUIResourceId(
+        ui::ANDROID_RESOURCE_TYPE_SYSTEM, kActiveResourceId);
 
     gfx::Size idle_size =
         parent->layer_tree_host()->GetUIResourceSize(idle_resource);
@@ -367,7 +367,7 @@ class OverscrollRefresh::Effect {
     active_layer_->RemoveFromParent();
   }
 
-  ui::SystemUIResourceManager* const resource_manager_;
+  ui::ResourceManager* const resource_manager_;
 
   scoped_refptr<cc::UIResourceLayer> idle_layer_;
   scoped_refptr<cc::UIResourceLayer> active_layer_;
@@ -403,10 +403,9 @@ class OverscrollRefresh::Effect {
   DISALLOW_COPY_AND_ASSIGN(Effect);
 };
 
-OverscrollRefresh::OverscrollRefresh(
-    ui::SystemUIResourceManager* resource_manager,
-    OverscrollRefreshClient* client,
-    float target_drag_offset_pixels)
+OverscrollRefresh::OverscrollRefresh(ui::ResourceManager* resource_manager,
+                                     OverscrollRefreshClient* client,
+                                     float target_drag_offset_pixels)
     : client_(client),
       scrolled_to_top_(true),
       scroll_consumption_state_(DISABLED),