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

cc/resources/tile_draw_info.h

 // Copyright 2013 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.
 
 #ifndef CC_RESOURCES_TILE_DRAW_INFO_H_
 #define CC_RESOURCES_TILE_DRAW_INFO_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/resources/platform_color.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/scoped_resource.h"
 #include "cc/resources/tile_task_runner.h"
 
 namespace cc {
 
 // This class holds all the state relevant to drawing a tile.
 class CC_EXPORT TileDrawInfo {
  public:
   enum Mode { RESOURCE_MODE, SOLID_COLOR_MODE, OOM_MODE };
 
   TileDrawInfo();
   ~TileDrawInfo();
 
   Mode mode() const { return mode_; }
 
   bool IsReadyToDraw() const;
 
-  ResourceProvider::ResourceId resource_id() const {
+  ResourceId resource_id() const {
     DCHECK(mode_ == RESOURCE_MODE);
     DCHECK(resource_);
     return resource_->id();
   }
 
   gfx::Size resource_size() const {
     DCHECK(mode_ == RESOURCE_MODE);
     DCHECK(resource_);
     return resource_->size();
   }
@@ skipping 35 matching lines @@
   void set_oom() { mode_ = OOM_MODE; }
 
   Mode mode_;
   SkColor solid_color_;
   scoped_ptr<ScopedResource> resource_;
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_TILE_DRAW_INFO_H_