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

cc/output/software_renderer.h

 // Copyright 2012 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_OUTPUT_SOFTWARE_RENDERER_H_
 #define CC_OUTPUT_SOFTWARE_RENDERER_H_
 
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/compositor_frame.h"
@@ skipping 56 matching lines @@
                    const RendererSettings* settings,
                    OutputSurface* output_surface,
                    ResourceProvider* resource_provider);
 
   void DidChangeVisibility() override;
 
  private:
   void ClearCanvas(SkColor color);
   void ClearFramebuffer(DrawingFrame* frame);
   void SetClipRect(const gfx::Rect& rect);
-  bool IsSoftwareResource(ResourceProvider::ResourceId resource_id) const;
+  bool IsSoftwareResource(ResourceId resource_id) const;
 
   void DrawCheckerboardQuad(const DrawingFrame* frame,
                             const CheckerboardDrawQuad* quad);
   void DrawDebugBorderQuad(const DrawingFrame* frame,
                            const DebugBorderDrawQuad* quad);
   void DrawPictureQuad(const DrawingFrame* frame,
                        const PictureDrawQuad* quad);
   void DrawRenderPassQuad(const DrawingFrame* frame,
                           const RenderPassDrawQuad* quad);
   void DrawSolidColorQuad(const DrawingFrame* frame,
@@ skipping 18 matching lines @@
       current_framebuffer_lock_;
   skia::RefPtr<SkCanvas> current_framebuffer_canvas_;
   scoped_ptr<SoftwareFrameData> current_frame_data_;
 
   DISALLOW_COPY_AND_ASSIGN(SoftwareRenderer);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_SOFTWARE_RENDERER_H_