Replace SystemUIResourceManager with ResourceManager

ui/android/resources/ui_resource_provider.cc

Index: ui/android/resources/ui_resource_provider.cc
diff --git a/content/browser/android/ui_resource_provider_impl.cc b/ui/android/resources/ui_resource_provider.cc
similarity index 53%
rename from content/browser/android/ui_resource_provider_impl.cc
rename to ui/android/resources/ui_resource_provider.cc
index cd45d7cc634d160e56ce9ddc67cde910ab834f0f..bbcff80debb17a230dd27afa2843256e41dac04e 100644
--- a/content/browser/android/ui_resource_provider_impl.cc
+++ b/ui/android/resources/ui_resource_provider.cc
@@ -2,43 +2,40 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/android/ui_resource_provider_impl.h"
+#include "ui/android/resources/ui_resource_provider.h"
 
 #include "cc/resources/ui_resource_client.h"
 #include "cc/trees/layer_tree_host.h"
-#include "content/public/browser/android/ui_resource_client_android.h"
+#include "ui/android/resources/ui_resource_client_android.h"
 
-namespace content {
-
-UIResourceProviderImpl::UIResourceProviderImpl()
-    : system_ui_resource_manager_(this), host_(NULL),
-      supports_etc1_npot_(false) {
+namespace ui {
 
+UIResourceProvider::UIResourceProvider()
+    : host_(NULL), supports_etc1_npot_(false) {
 }
 
-UIResourceProviderImpl::~UIResourceProviderImpl() {
+UIResourceProvider::~UIResourceProvider() {
   SetLayerTreeHost(NULL);
 }
 
-void UIResourceProviderImpl::SetLayerTreeHost(cc::LayerTreeHost* host) {
+void UIResourceProvider::SetLayerTreeHost(cc::LayerTreeHost* host) {
   if (host_ == host)
     return;
   host_ = host;
   UIResourcesAreInvalid();
 }
 
-void UIResourceProviderImpl::UIResourcesAreInvalid() {
+void UIResourceProvider::UIResourcesAreInvalid() {
   UIResourceClientMap client_map = ui_resource_client_map_;

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

Nit: This should really be (sorry, I know this wasn't your change):

UIResourceClientMap client_map;
client_map.swap(ui_resource_client_map_);

[Jaekyun Seok (inactive), 2014/12/10 21:42:38]

Done.

   ui_resource_client_map_.clear();
   for (UIResourceClientMap::iterator iter = client_map.begin();
-       iter != client_map.end();
-       iter++) {
+       iter != client_map.end(); iter++) {
     iter->second->UIResourceIsInvalid();
   }
 }
 
-cc::UIResourceId UIResourceProviderImpl::CreateUIResource(
-    UIResourceClientAndroid* client) {
+cc::UIResourceId UIResourceProvider::CreateUIResource(
+    ui::UIResourceClientAndroid* client) {
   if (!host_)
     return 0;
   cc::UIResourceId id = host_->CreateUIResource(client);
@@ -48,7 +45,7 @@ cc::UIResourceId UIResourceProviderImpl::CreateUIResource(
   return id;
 }
 
-void UIResourceProviderImpl::DeleteUIResource(cc::UIResourceId ui_resource_id) {
+void UIResourceProvider::DeleteUIResource(cc::UIResourceId ui_resource_id) {
   UIResourceClientMap::iterator iter =
       ui_resource_client_map_.find(ui_resource_id);
   DCHECK(iter != ui_resource_client_map_.end());
@@ -60,13 +57,8 @@ void UIResourceProviderImpl::DeleteUIResource(cc::UIResourceId ui_resource_id) {
   host_->DeleteUIResource(ui_resource_id);
 }
 
-ui::SystemUIResourceManager&
-UIResourceProviderImpl::GetSystemUIResourceManager() {
-  return system_ui_resource_manager_;
-}
-
-bool UIResourceProviderImpl::SupportsETC1NonPowerOfTwo() const {
+bool UIResourceProvider::SupportsETC1NonPowerOfTwo() const {
   return supports_etc1_npot_;
 }
 
-}  // namespace content
+}  // namespace ui