Replace SystemUIResourceManager with ResourceManager

content/browser/android/overscroll_refresh_unittest.cc

Index: content/browser/android/overscroll_refresh_unittest.cc
diff --git a/content/browser/android/overscroll_refresh_unittest.cc b/content/browser/android/overscroll_refresh_unittest.cc
index da5efb01eae6662428c07e7347ec65e62e4d51f6..f71550350be7c9610cca5abeba1880cd2ade43a1 100644
--- a/content/browser/android/overscroll_refresh_unittest.cc
+++ b/content/browser/android/overscroll_refresh_unittest.cc
@@ -5,7 +5,7 @@
 #include "cc/layers/layer.h"
 #include "content/browser/android/overscroll_refresh.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/android/system_ui_resource_manager.h"
+#include "ui/android/resources/resource_manager.h"
 
 namespace content {
 
@@ -16,10 +16,11 @@ gfx::SizeF DefaultViewportSize() {
 }
 
 class OverscrollRefreshTest : public OverscrollRefreshClient,
-                              public ui::SystemUIResourceManager,
+                              public ui::ResourceManager,
                               public testing::Test {
  public:
-  OverscrollRefreshTest() : refresh_triggered_(false) {}
+  OverscrollRefreshTest()
+      : ui::ResourceManager(nullptr), refresh_triggered_(false) {}
 
   // OverscrollRefreshClient implementation.
   void TriggerRefresh() override {
@@ -29,8 +30,8 @@ class OverscrollRefreshTest : public OverscrollRefreshClient,
 
   bool IsStillRefreshing() const override { return still_refreshing_; }
 
-  // SystemUIResoruceManager implementation.
-  void PreloadResource(ui::SystemUIResourceType) override {}
+  // ResoruceManager implementation.

[jdduke (slow), 2014/12/10 22:19:47]

I missed this change, hmm... 

Either we should make ui::ResourceManager a pure virtual interface, with a
ui::ResourceManagerImpl implementation for production, or we should have just
one MockResourceManager for testing that only overrides those two private
virtual methods. Having both public and private virtual methods on
ResourceManager makes it difficult to reason about.

+  void PreloadResource(ui::AndroidResourceType res_type, int res_id) override {}
 
   bool GetAndResetRefreshTriggered() {
     bool triggered = refresh_triggered_;
@@ -41,7 +42,8 @@ class OverscrollRefreshTest : public OverscrollRefreshClient,
  protected:
   void SignalRefreshCompleted() { still_refreshing_ = false; }
 
-  cc::UIResourceId GetUIResourceId(ui::SystemUIResourceType) override {
+  cc::UIResourceId GetUIResourceId(ui::AndroidResourceType res_type,
+                                   int res_id) override {
     return 0;
   }