Rename two different kInitialResourceId

In jumbo builds two different kInitialResourceId constants
(one with value 1 and one with value 2) ended up in the same
translation unit which then would not compile.

This renames them to kDisplayInitialResourceId and
kLayerTreeInitialResourceId.

Bug: 786956
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
Change-Id: I00cba4916459598d2240510f2c4c12fd18787538
Reviewed-on: https://chromium-review.googlesource.com/779260
Commit-Queue: Daniel Bratell <bratell@opera.com>
Reviewed-by: enne <enne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#518209}

cc/resources/display_resource_provider.cc

@@ -15,9 +15,9 @@ using gpu::gles2::GLES2Interface;
 namespace cc {
 
 namespace {
-// The Resouce id in DisplayResourceProvider starts from 2 to avoid conflicts
-// with id from LayerTreeResourceProvider.
-const unsigned int kInitialResourceId = 2;
+// The resource id in DisplayResourceProvider starts from 2 to avoid
+// conflicts with id from LayerTreeResourceProvider.
+const unsigned int kDisplayInitialResourceId = 2;
 }  // namespace
 
 DisplayResourceProvider::DisplayResourceProvider(
@@ -30,7 +30,7 @@ DisplayResourceProvider::DisplayResourceProvider(
                        gpu_memory_buffer_manager,
                        false,
                        resource_settings,
-                       kInitialResourceId) {}
+                       kDisplayInitialResourceId) {}
 
 DisplayResourceProvider::~DisplayResourceProvider() {
   while (!children_.empty())

cc/resources/layer_tree_resource_provider.cc

@@ -16,9 +16,9 @@ using gpu::gles2::GLES2Interface;
 namespace cc {
 
 namespace {
-// The Resouce id in LayerTreeResourceProvider starts from 1 to avoid conflicts
-// with id from DisplayResourceProvider.
-const unsigned int kInitialResourceId = 1;
+// The resource id in LayerTreeResourceProvider starts from 1 to avoid
+// conflicts with id from DisplayResourceProvider.
+const unsigned int kLayerTreeInitialResourceId = 1;
 }  // namespace
 
 struct LayerTreeResourceProvider::ImportedResource {
@@ -55,7 +55,7 @@ LayerTreeResourceProvider::LayerTreeResourceProvider(
                        gpu_memory_buffer_manager,
                        delegated_sync_points_required,
                        resource_settings,
-                       kInitialResourceId) {}
+                       kLayerTreeInitialResourceId) {}
 
 LayerTreeResourceProvider::~LayerTreeResourceProvider() {
   for (auto& pair : imported_resources_) {