Replace SystemUIResourceManager with ResourceManager

content/browser/android/overscroll_refresh_unittest.cc

 // 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 "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 {
 
 const float kDragTargetPixels = 100;
 
 gfx::SizeF DefaultViewportSize() {
   return gfx::SizeF(512, 512);
 }
 
 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 {
     refresh_triggered_ = true;
     still_refreshing_ = true;
   }
 
   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_;
     refresh_triggered_ = false;
     return triggered;
   }
 
  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;
   }
 
  private:
   bool refresh_triggered_;
   bool still_refreshing_;
 };
 
 TEST_F(OverscrollRefreshTest, Basic) {
   OverscrollRefresh effect(this, this, kDragTargetPixels);
@@ skipping 234 matching lines @@
   scoped_refptr<cc::Layer> layer = cc::Layer::Create();
   while (effect.Animate(current_time, layer.get()))
     current_time += base::TimeDelta::FromMilliseconds(16);
 
   EXPECT_GT(current_time.ToInternalValue(), initial_time.ToInternalValue());
   EXPECT_FALSE(effect.IsActive());
   EXPECT_FALSE(GetAndResetRefreshTriggered());
 }
 
 }  // namespace content