cc: Fix header include guards of our header files.

Fixed with a hacky python script :/

BUG=144576,144577
TEST=$ cpplint.py cc/*.h 2>&1 | grep header_guard. And verified it doesn't complain.
R=enne@chromium.org,jamesr@chromium.org


Review URL: https://chromiumcodereview.appspot.com/11368063

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165895 0039d316-1c4b-4281-b951-d872f2087c98

18 files changed, 49 insertions, 89 deletions

diff --git a/cc/test/CCLayerTreeTestCommon.h b/cc/test/CCLayerTreeTestCommon.h
deleted file mode 100644
index 1e9a473..0000000
--- a/cc/test/CCLayerTreeTestCommon.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2011 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 CCLayerTreeTestCommon_h
-#define CCLayerTreeTestCommon_h
-
-#include <public/WebTransformationMatrix.h>
-
-namespace WebKitTests {
-
-// These are macros instead of functions so that we get useful line numbers where a test failed.
-#define EXPECT_FLOAT_RECT_EQ(expected, actual)                          \
-    EXPECT_FLOAT_EQ((expected).location().x(), (actual).location().x()); \
-    EXPECT_FLOAT_EQ((expected).location().y(), (actual).location().y()); \
-    EXPECT_FLOAT_EQ((expected).size().width(), (actual).size().width()); \
-    EXPECT_FLOAT_EQ((expected).size().height(), (actual).size().height())
-
-#define EXPECT_INT_RECT_EQ(expected, actual)                            \
-    EXPECT_EQ((expected).location().x(), (actual).location().x());      \
-    EXPECT_EQ((expected).location().y(), (actual).location().y());      \
-    EXPECT_EQ((expected).size().width(), (actual).size().width());      \
-    EXPECT_EQ((expected).size().height(), (actual).size().height())
-
-// This is a function rather than a macro because when this is included as a macro
-// in bulk, it causes a significant slow-down in compilation time. This problem
-// exists with both gcc and clang, and bugs have been filed at
-// http://llvm.org/bugs/show_bug.cgi?id=13651 and http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54337
-void ExpectTransformationMatrixEq(WebKit::WebTransformationMatrix expected,
-                                  WebKit::WebTransformationMatrix actual);
-
-#define EXPECT_TRANSFORMATION_MATRIX_EQ(expected, actual)            \
-    {                                                                \
-        SCOPED_TRACE("");                                            \
-        WebKitTests::ExpectTransformationMatrixEq(expected, actual); \
-    }
-
-} // namespace
-
-#endif // CCLayerTreeTestCommon_h
diff --git a/cc/test/animation_test_common.h b/cc/test/animation_test_common.h
index 7b512d7..bdce62c 100644
--- a/cc/test/animation_test_common.h
+++ b/cc/test/animation_test_common.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CCAnimationTestCommon_h
-#define CCAnimationTestCommon_h
+#ifndef CC_TEST_ANIMATION_TEST_COMMON_H_
+#define CC_TEST_ANIMATION_TEST_COMMON_H_
 
 #include "cc/active_animation.h"
 #include "cc/animation_curve.h"
@@ -88,4 +88,4 @@ void addAnimatedTransformToLayer(cc::LayerImpl&, double duration, int deltaX, in
 
 } // namespace WebKitTests
 
-#endif // CCAnimationTesctCommon_h
+#endif  // CC_TEST_ANIMATION_TEST_COMMON_H_
diff --git a/cc/test/compositor_fake_web_graphics_context_3d.h b/cc/test/compositor_fake_web_graphics_context_3d.h
index 839f5d4..7a9c496 100644
--- a/cc/test/compositor_fake_web_graphics_context_3d.h
+++ b/cc/test/compositor_fake_web_graphics_context_3d.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CompositorFakeWebGraphicsContext3D_h
-#define CompositorFakeWebGraphicsContext3D_h
+#ifndef CC_TEST_COMPOSITOR_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_
+#define CC_TEST_COMPOSITOR_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/test/fake_web_graphics_context_3d.h"
@@ -33,4 +33,4 @@ protected:
 
 }
 
-#endif
+#endif  // CC_TEST_COMPOSITOR_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_
diff --git a/cc/test/fake_graphics_context.h b/cc/test/fake_graphics_context.h
index 7fdb38a..aecfcc4 100644
--- a/cc/test/fake_graphics_context.h
+++ b/cc/test/fake_graphics_context.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FakeCCGraphicsContext_h
-#define FakeCCGraphicsContext_h
+#ifndef CC_TEST_FAKE_GRAPHICS_CONTEXT_H_
+#define CC_TEST_FAKE_GRAPHICS_CONTEXT_H_
 
 #include "cc/graphics_context.h"
 #include "cc/test/compositor_fake_web_graphics_context_3d.h"
@@ -19,4 +19,4 @@ static inline scoped_ptr<cc::GraphicsContext> createFakeGraphicsContext()
 
 } // namespace WebKit
 
-#endif // FakeCCGraphicsContext_h
+#endif  // CC_TEST_FAKE_GRAPHICS_CONTEXT_H_
diff --git a/cc/test/fake_layer_tree_host_client.h b/cc/test/fake_layer_tree_host_client.h
index 2cdf93c..8140495 100644
--- a/cc/test/fake_layer_tree_host_client.h
+++ b/cc/test/fake_layer_tree_host_client.h
@@ -1,8 +1,8 @@
 // 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 FakeCCLayerTreeHostClient_h
-#define FakeCCLayerTreeHostClient_h
+#ifndef CC_TEST_FAKE_LAYER_TREE_HOST_CLIENT_H_
+#define CC_TEST_FAKE_LAYER_TREE_HOST_CLIENT_H_
 
 #include "config.h"
 
@@ -35,4 +35,4 @@ public:
 };
 
 }
-#endif // FakeCCLayerTreeHostClient_h
+#endif  // CC_TEST_FAKE_LAYER_TREE_HOST_CLIENT_H_
diff --git a/cc/test/fake_web_compositor_output_surface.h b/cc/test/fake_web_compositor_output_surface.h
index d4b1ec5..3cd5b80 100644
--- a/cc/test/fake_web_compositor_output_surface.h
+++ b/cc/test/fake_web_compositor_output_surface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FakeWebCompositorOutputSurface_h
-#define FakeWebCompositorOutputSurface_h
+#ifndef CC_TEST_FAKE_WEB_COMPOSITOR_OUTPUT_SURFACE_H_
+#define CC_TEST_FAKE_WEB_COMPOSITOR_OUTPUT_SURFACE_H_
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ -73,4 +73,4 @@ private:
 
 } // namespace WebKit
 
-#endif // FakeWebCompositorOutputSurface_h
+#endif  // CC_TEST_FAKE_WEB_COMPOSITOR_OUTPUT_SURFACE_H_
diff --git a/cc/test/fake_web_compositor_software_output_device.h b/cc/test/fake_web_compositor_software_output_device.h
index b71adee..6b17a5d 100644
--- a/cc/test/fake_web_compositor_software_output_device.h
+++ b/cc/test/fake_web_compositor_software_output_device.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FakeWebCompositorSoftwareOutputDevice_h
-#define FakeWebCompositorSoftwareOutputDevice_h
+#ifndef CC_TEST_FAKE_WEB_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_H_
+#define CC_TEST_FAKE_WEB_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_H_
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ -42,4 +42,4 @@ private:
 
 } // namespace WebKit
 
-#endif // FakeWebCompositorSoftwareOutputDevice_h
+#endif  // CC_TEST_FAKE_WEB_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_H_
diff --git a/cc/test/fake_web_graphics_context_3d.h b/cc/test/fake_web_graphics_context_3d.h
index 7d4b62c..bb8e893 100644
--- a/cc/test/fake_web_graphics_context_3d.h
+++ b/cc/test/fake_web_graphics_context_3d.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FakeWebGraphicsContext3D_h
-#define FakeWebGraphicsContext3D_h
+#ifndef CC_TEST_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_
+#define CC_TEST_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_
 
 #include "third_party/khronos/GLES2/gl2.h"
 #include <public/WebGraphicsContext3D.h>
@@ -257,4 +257,4 @@ protected:
 
 } // namespace WebKit
 
-#endif // FakeWebGraphicsContext3D_h
+#endif  // CC_TEST_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_
diff --git a/cc/test/fake_web_scrollbar_theme_geometry.h b/cc/test/fake_web_scrollbar_theme_geometry.h
index faab980..cbff58e 100644
--- a/cc/test/fake_web_scrollbar_theme_geometry.h
+++ b/cc/test/fake_web_scrollbar_theme_geometry.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FakeWebScrollbarThemeGeometry_h
-#define FakeWebScrollbarThemeGeometry_h
+#ifndef CC_TEST_FAKE_WEB_SCROLLBAR_THEME_GEOMETRY_H_
+#define CC_TEST_FAKE_WEB_SCROLLBAR_THEME_GEOMETRY_H_
 
 #include <public/WebScrollbarThemeGeometry.h>
 
@@ -44,4 +44,4 @@ public:
 
 } // namespace WebKit
 
-#endif // FakeWebScrollbarThemeGeometry_h
+#endif  // CC_TEST_FAKE_WEB_SCROLLBAR_THEME_GEOMETRY_H_
diff --git a/cc/test/geometry_test_utils.h b/cc/test/geometry_test_utils.h
index 9eaf52a..7877a64 100644
--- a/cc/test/geometry_test_utils.h
+++ b/cc/test/geometry_test_utils.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CCGeometryTestUtils_h
-#define CCGeometryTestUtils_h
+#ifndef CC_TEST_GEOMETRY_TEST_UTILS_H_
+#define CC_TEST_GEOMETRY_TEST_UTILS_H_
 
 namespace WebKit {
 class WebTransformationMatrix;
@@ -55,4 +55,4 @@ void ExpectTransformationMatrixEq(const WebKit::WebTransformationMatrix& expecte
 
 } // namespace WebKitTests
 
-#endif // CCGeometryTestUtils_h
+#endif  // CC_TEST_GEOMETRY_TEST_UTILS_H_
diff --git a/cc/test/layer_test_common.h b/cc/test/layer_test_common.h
index 4b32d82..7b6309f 100644
--- a/cc/test/layer_test_common.h
+++ b/cc/test/layer_test_common.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CCLayerTestCommon_h
-#define CCLayerTestCommon_h
+#ifndef CC_TEST_LAYER_TEST_COMMON_H_
+#define CC_TEST_LAYER_TEST_COMMON_H_
 
 namespace cc {
 class QuadList;
@@ -20,4 +20,4 @@ extern const char* quadString;
 void verifyQuadsExactlyCoverRect(const cc::QuadList&, const gfx::Rect&);
 
 } // namespace LayerTestCommon
-#endif // CCLayerTestCommon_h
+#endif  // CC_TEST_LAYER_TEST_COMMON_H_
diff --git a/cc/test/layer_tree_test_common.h b/cc/test/layer_tree_test_common.h
index b0f277b..e33480f 100644
--- a/cc/test/layer_tree_test_common.h
+++ b/cc/test/layer_tree_test_common.h
@@ -207,4 +207,4 @@ private:
         runTest(true);                                    \
     }
 
-#endif // CC_TEST_LAYER_TREE_TEST_COMMON_H_
+#endif  // CC_TEST_LAYER_TREE_TEST_COMMON_H_
diff --git a/cc/test/mock_quad_culler.h b/cc/test/mock_quad_culler.h
index 7292387..2f15dcc 100644
--- a/cc/test/mock_quad_culler.h
+++ b/cc/test/mock_quad_culler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MockCCQuadCuller_h
-#define MockCCQuadCuller_h
+#ifndef CC_TEST_MOCK_QUAD_CULLER_H_
+#define CC_TEST_MOCK_QUAD_CULLER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/draw_quad.h"
@@ -35,4 +35,4 @@ private:
 
 }  // namespace cc
 
-#endif // MockCCQuadCuller_h
+#endif  // CC_TEST_MOCK_QUAD_CULLER_H_
diff --git a/cc/test/occlusion_tracker_test_common.h b/cc/test/occlusion_tracker_test_common.h
index c515155..7619ad8 100644
--- a/cc/test/occlusion_tracker_test_common.h
+++ b/cc/test/occlusion_tracker_test_common.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CCOcclusionTrackerTestCommon_h
-#define CCOcclusionTrackerTestCommon_h
+#ifndef CC_TEST_OCCLUSION_TRACKER_TEST_COMMON_H_
+#define CC_TEST_OCCLUSION_TRACKER_TEST_COMMON_H_
 
 #include "Region.h"
 #include "cc/occlusion_tracker.h"
@@ -33,4 +33,4 @@ typedef TestOcclusionTrackerBase<cc::LayerImpl, cc::RenderSurfaceImpl> TestOcclu
 
 }
 
-#endif // CCOcclusionTrackerTestCommon_h
+#endif  // CC_TEST_OCCLUSION_TRACKER_TEST_COMMON_H_
diff --git a/cc/test/render_pass_test_common.h b/cc/test/render_pass_test_common.h
index d9c137c..a77747e5 100644
--- a/cc/test/render_pass_test_common.h
+++ b/cc/test/render_pass_test_common.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CCRenderPassTestCommon_h
-#define CCRenderPassTestCommon_h
+#ifndef CC_TEST_RENDER_PASS_TEST_COMMON_H_
+#define CC_TEST_RENDER_PASS_TEST_COMMON_H_
 
 #include "cc/render_pass.h"
 
@@ -28,4 +28,4 @@ protected:
 
 }  // namespace WebKitTests
 
-#endif // CCRenderPassTestCommon_h
+#endif  // CC_TEST_RENDER_PASS_TEST_COMMON_H_
diff --git a/cc/test/scheduler_test_common.h b/cc/test/scheduler_test_common.h
index e43e4b8..af1bd32 100644
--- a/cc/test/scheduler_test_common.h
+++ b/cc/test/scheduler_test_common.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CCSchedulerTestCommon_h
-#define CCSchedulerTestCommon_h
+#ifndef CC_TEST_SCHEDULER_TEST_COMMON_H_
+#define CC_TEST_SCHEDULER_TEST_COMMON_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/delay_based_time_source.h"
@@ -122,4 +122,4 @@ public:
 
 }
 
-#endif // CCSchedulerTestCommon_h
+#endif  // CC_TEST_SCHEDULER_TEST_COMMON_H_
diff --git a/cc/test/test_common.h b/cc/test/test_common.h
index 9c6c0ce..eea843f 100644
--- a/cc/test/test_common.h
+++ b/cc/test/test_common.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CCTestCommon_h
-#define CCTestCommon_h
+#ifndef CC_TEST_TEST_COMMON_H_
+#define CC_TEST_TEST_COMMON_H_
 
 #include "cc/settings.h"
 
@@ -19,4 +19,4 @@ public:
 
 } // namespace WebKitTests
 
-#endif // CCTestCommon_h
+#endif  // CC_TEST_TEST_COMMON_H_
diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h
index 2b95222..2b0f13b 100644
--- a/cc/test/tiled_layer_test_common.h
+++ b/cc/test/tiled_layer_test_common.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CCTiledLayerTestCommon_h
-#define CCTiledLayerTestCommon_h
+#ifndef CC_TEST_TILED_LAYER_TEST_COMMON_H_
+#define CC_TEST_TILED_LAYER_TEST_COMMON_H_
 
 #include "Region.h"
 #include "cc/layer_updater.h"
@@ -126,4 +126,4 @@ protected:
 };
 
 }
-#endif // CCTiledLayerTestCommon_h
+#endif  // CC_TEST_TILED_LAYER_TEST_COMMON_H_