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

cc/surfaces/surface_resource_holder.h

Index: cc/surfaces/surface_resource_holder.h
diff --git a/cc/surfaces/surface_resource_holder.h b/cc/surfaces/surface_resource_holder.h
index 20c9f2918489291486a178829563c0e82486534c..95cdb827c070d770f98df2c8dabc836b79ef7e55 100644
--- a/cc/surfaces/surface_resource_holder.h
+++ b/cc/surfaces/surface_resource_holder.h
@@ -7,8 +7,9 @@
 
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
-#include "cc/resources/resource_provider.h"
+#include "cc/base/resource_id.h"
 #include "cc/resources/returned_resource.h"
+#include "cc/resources/transferable_resource.h"
 #include "cc/surfaces/surfaces_export.h"
 
 namespace cc {
@@ -39,8 +40,7 @@ class CC_SURFACES_EXPORT SurfaceResourceHolder {
   // Keeps track of the number of users currently in flight for each resource
   // ID we've received from the client. When this counter hits zero for a
   // particular resource, that ID is available to return to the client.
-  typedef base::hash_map<ResourceProvider::ResourceId, ResourceRefs>
-      ResourceIdCountMap;
+  typedef base::hash_map<ResourceId, ResourceRefs> ResourceIdCountMap;
   ResourceIdCountMap resource_id_use_count_map_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceResourceHolder);