Replace SystemUIResourceManager with ResourceManager

ui/android/resources/resource_manager.h

Index: ui/android/resources/resource_manager.h
diff --git a/ui/android/resources/resource_manager.h b/ui/android/resources/resource_manager.h
index 730d4dc5afcf594d58527a768207bc3c249c3fea..187e2e38c76d2209aef21192e23b6480edf6d789 100644
--- a/ui/android/resources/resource_manager.h
+++ b/ui/android/resources/resource_manager.h
@@ -5,19 +5,19 @@
 #ifndef UI_ANDROID_RESOURCES_RESOURCE_MANAGER_H_
 #define UI_ANDROID_RESOURCES_RESOURCE_MANAGER_H_
 
+#include <string>
+
 #include "base/android/jni_android.h"
 #include "base/id_map.h"
 #include "cc/resources/ui_resource_client.h"
 #include "ui/android/ui_android_export.h"
+#include "ui/base/android/system_ui_resource_type.h"
 #include "ui/gfx/geometry/rect.h"
 
-namespace content {
-class UIResourceProvider;
-}
-
 namespace ui {
 
 class UIResourceAndroid;
+class UIResourceProvider;
 
 // A Java counterpart will be generated for this enum.
 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.ui.resources
@@ -49,14 +49,20 @@ class UI_ANDROID_EXPORT ResourceManager {
 
   static ResourceManager* FromJavaObject(jobject jobj);
 
-  explicit ResourceManager(content::UIResourceProvider* ui_resource_provider);
+  explicit ResourceManager(ui::UIResourceProvider* ui_resource_provider);
   virtual ~ResourceManager();
 
   base::android::ScopedJavaLocalRef<jobject> GetJavaObject(JNIEnv* env);
 
+  virtual void PreloadResource(ui::SystemUIResourceType type);

[jdduke (slow), 2014/12/10 01:46:41]

Let's go ahead and remove these two methods, updating the callers to use the new
Preload/Get API.

[Jaekyun Seok (inactive), 2014/12/10 02:25:41]

I believe that GetUIResourceId is useful and so I will keep it after changing it
to get res_type and res_id as parameters.

+  virtual cc::UIResourceId GetUIResourceId(ui::SystemUIResourceType type);
+
   ResourceManager::Resource* GetResource(AndroidResourceType res_type,
                                          int res_id);
+  ResourceManager::Resource* GetResource(AndroidResourceType res_type,

[jdduke (slow), 2014/12/10 01:46:41]

I'm wary of adding these methods that take a string without having any existing
users. Could we add them later? 

In any case, please avoid passing std::string by value. Either pass by const
ref, or pass a const char* (or a StringPiece).

[Jaekyun Seok (inactive), 2014/12/10 02:25:41]

I agree. Let's do this later when it is needed.

+                                         std::string res_name);
   void PreloadResource(AndroidResourceType res_type, int res_id);
+  void PreloadResource(AndroidResourceType res_type, std::string res_name);
 
   // Called from Java ----------------------------------------------------------
   void OnResourceReady(JNIEnv* env,
@@ -76,12 +82,23 @@ class UI_ANDROID_EXPORT ResourceManager {
   static bool RegisterResourceManager(JNIEnv* env);
 
  private:
+  friend class TestResourceManager;
+
+  int GetAndroidResourceIdFromString(std::string res_name);
+
+  // Start loading the resource. virtual for testing.
+  virtual void PreloadResourceFromJava(AndroidResourceType res_type,
+                                       int res_id);
+  virtual void RequestResourceFromJava(AndroidResourceType res_type,
+                                       int res_id);
+
   typedef IDMap<Resource, IDMapOwnPointer> ResourceMap;
 
-  content::UIResourceProvider* ui_resource_provider_;
+  ui::UIResourceProvider* ui_resource_provider_;
   ResourceMap resources_[ANDROID_RESOURCE_TYPE_COUNT];
 
   base::android::ScopedJavaGlobalRef<jobject> java_obj_;
+  base::hash_map<std::string, int> android_res_name_to_res_id_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceManager);
 };