Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/resources/scoped_resource.cc

 // 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.
 
 #include "cc/resources/scoped_resource.h"
 
 namespace cc {
 
 ScopedResource::ScopedResource(ResourceProvider* resource_provider)
     : resource_provider_(resource_provider) {
@@ skipping 20 matching lines @@
 }
 
 void ScopedResource::AllocateManaged(const gfx::Size& size,
                                      GLenum target,
                                      ResourceFormat format) {
   DCHECK(!id());
   DCHECK(!size.IsEmpty());
 
   set_dimensions(size, format);
   set_id(resource_provider_->CreateManagedResource(
-      size, target, GL_CLAMP_TO_EDGE, ResourceProvider::TEXTURE_HINT_IMMUTABLE,
+      size,
+      target,
+      GL_CLAMP_TO_EDGE,
+      ResourceProvider::TextureHintImmutable,
       format));
 
 #if DCHECK_IS_ON()
   allocate_thread_id_ = base::PlatformThread::CurrentId();
 #endif
 }
 
 void ScopedResource::Free() {
   if (id()) {
 #if DCHECK_IS_ON()
     DCHECK(allocate_thread_id_ == base::PlatformThread::CurrentId());
 #endif
     resource_provider_->DeleteResource(id());
   }
   set_id(0);
 }
 
 }  // namespace cc