Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/test/test_web_graphics_context_3d.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_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_
 #define CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_
 
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 355 matching lines @@
   void set_test_support(TestContextSupport* test_support) {
     test_support_ = test_support;
   }
 
   int width() const { return width_; }
   int height() const { return height_; }
   bool reshape_called() const { return reshape_called_; }
   void clear_reshape_called() { reshape_called_ = false; }
   float scale_factor() const { return scale_factor_; }
 
-  enum UpdateType { NO_UPDATE = 0, PREPARE_TEXTURE, POST_SUB_BUFFER };
+  enum UpdateType {
+    NoUpdate = 0,
+    PrepareTexture,
+    PostSubBuffer
+  };
 
   gfx::Rect update_rect() const { return update_rect_; }
 
   UpdateType last_update_type() { return last_update_type_; }
 
  protected:
   struct TextureTargets {
     TextureTargets();
     ~TextureTargets();
 
@@ skipping 91 matching lines @@
 
   scoped_refptr<Namespace> namespace_;
   static Namespace* shared_namespace_;
 
   base::WeakPtrFactory<TestWebGraphicsContext3D> weak_ptr_factory_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_