ui/android: Fix Resource meta-data sharing with ResourceManager.

chrome/browser/android/compositor/decoration_title.cc

Index: chrome/browser/android/compositor/decoration_title.cc
diff --git a/chrome/browser/android/compositor/decoration_title.cc b/chrome/browser/android/compositor/decoration_title.cc
index 4cb6525ac3e4465ecb63f39dc2f416dfd6315ad5..9012ec8e5100e69f7510fa70463ced4f297e8436 100644
--- a/chrome/browser/android/compositor/decoration_title.cc
+++ b/chrome/browser/android/compositor/decoration_title.cc
@@ -81,22 +81,20 @@ void DecorationTitle::SetFaviconResourceId(int favicon_resource_id) {
 }
 
 void DecorationTitle::SetUIResourceIds() {
-  ui::ResourceManager::Resource* title_resource =
-      resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_DYNAMIC_BITMAP,
-                                     title_resource_id_);
+  ui::Resource* title_resource = resource_manager_->GetResource(
+      ui::ANDROID_RESOURCE_TYPE_DYNAMIC_BITMAP, title_resource_id_);
   if (title_resource) {
-    layer_opaque_->SetUIResourceId(title_resource->ui_resource->id());
-    layer_fade_->SetUIResourceId(title_resource->ui_resource->id());
-    title_size_ = title_resource->size;
+    layer_opaque_->SetUIResourceId(title_resource->ui_resource()->id());
+    layer_fade_->SetUIResourceId(title_resource->ui_resource()->id());
+    title_size_ = title_resource->size();
   }
 
   if (!is_loading_) {
-    ui::ResourceManager::Resource* favicon_resource =
-        resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_DYNAMIC_BITMAP,
-                                       favicon_resource_id_);
+    ui::Resource* favicon_resource = resource_manager_->GetResource(
+        ui::ANDROID_RESOURCE_TYPE_DYNAMIC_BITMAP, favicon_resource_id_);
     if (favicon_resource) {
-      layer_favicon_->SetUIResourceId(favicon_resource->ui_resource->id());
-      favicon_size_ = favicon_resource->size;
+      layer_favicon_->SetUIResourceId(favicon_resource->ui_resource()->id());
+      favicon_size_ = favicon_resource->size();
     } else {
       layer_favicon_->SetUIResourceId(0);
     }
@@ -105,12 +103,11 @@ void DecorationTitle::SetUIResourceIds() {
     int resource_id =
         is_incognito_ ? spinner_incognito_resource_id_ : spinner_resource_id_;
 
-    ui::ResourceManager::Resource* spinner_resource =
-        resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                       resource_id);
+    ui::Resource* spinner_resource = resource_manager_->GetResource(
+        ui::ANDROID_RESOURCE_TYPE_STATIC, resource_id);
 
     if (spinner_resource)
-      layer_favicon_->SetUIResourceId(spinner_resource->ui_resource->id());
+      layer_favicon_->SetUIResourceId(spinner_resource->ui_resource()->id());
 
     // Rotate about the center of the layer.
     layer_favicon_->SetTransformOrigin(