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

cc/test/render_pass_test_utils.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_TEST_RENDER_PASS_TEST_UTILS_H_
 #define CC_TEST_RENDER_PASS_TEST_UTILS_H_
 
 #include "cc/base/scoped_ptr_vector.h"
 #include "cc/output/filter_operations.h"
 #include "cc/quads/render_pass.h"
@@ skipping 33 matching lines @@
                                        SkColor color,
                                        const gfx::Transform& transform);
 
 // Adds a render pass quad to an existing render pass.
 void AddRenderPassQuad(TestRenderPass* to_pass,
                        TestRenderPass* contributing_pass);
 
 // Adds a render pass quad with the given mask resource, filter, and transform.
 void AddRenderPassQuad(TestRenderPass* toPass,
                        TestRenderPass* contributing_pass,
-                       ResourceProvider::ResourceId mask_resource_id,
+                       ResourceId mask_resource_id,
                        const FilterOperations& filters,
                        gfx::Transform transform,
                        SkXfermode::Mode blend_mode);
 
 }  // namespace cc
 
 #endif  // CC_TEST_RENDER_PASS_TEST_UTILS_H_