Rename cc::ResourceProvider::ResourceId to cc::ResourceId and move it to its own file.

cc/surfaces/surface_aggregator.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/surfaces/surface_aggregator.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/containers/hash_tables.h"
@@ skipping 113 matching lines @@
       provider_->SetChildNeedsSyncPoints(
           child_id, surface->factory()->needs_sync_points());
     }
     surface_id_to_resource_child_id_[surface->surface_id()] = child_id;
     return child_id;
   } else {
     return it->second;
   }
 }
 
-static ResourceProvider::ResourceId ResourceRemapHelper(
+static ResourceId ResourceRemapHelper(
     const ResourceProvider::ResourceIdMap& child_to_parent_map,
-    ResourceProvider::ResourceId id) {
+    ResourceId id) {
   ResourceProvider::ResourceIdMap::const_iterator it =
       child_to_parent_map.find(id);
   DCHECK(it != child_to_parent_map.end());
 
   DCHECK_EQ(it->first, id);
-  ResourceProvider::ResourceId remapped_id = it->second;
+  ResourceId remapped_id = it->second;
   return remapped_id;
 }
 
-static ResourceProvider::ResourceId ValidateResourceHelper(
+static ResourceId ValidateResourceHelper(
     bool* invalid_frame,
     const ResourceProvider::ResourceIdMap& child_to_parent_map,
     ResourceProvider::ResourceIdSet* resources_in_frame,
-    ResourceProvider::ResourceId id) {
+    ResourceId id) {
   ResourceProvider::ResourceIdMap::const_iterator it =
       child_to_parent_map.find(id);
   if (it == child_to_parent_map.end()) {
     *invalid_frame = true;
     return id;
   }
   resources_in_frame->insert(id);
   return id;
 }
 
@@ skipping 391 matching lines @@
 
 void SurfaceAggregator::SetFullDamageForSurface(SurfaceId surface_id) {
   auto it = previous_contained_surfaces_.find(surface_id);
   if (it == previous_contained_surfaces_.end())
     return;
   // Set the last drawn index as 0 to ensure full damage next time it's drawn.
   it->second = 0;
 }
 
 }  // namespace cc