Part 4 of cc/ directory shuffles: output

cc/output/output_surface.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_OUTPUT_SURFACE_H_
-#define CC_OUTPUT_SURFACE_H_
+#ifndef CC_OUTPUT_OUTPUT_SURFACE_H_
+#define CC_OUTPUT_OUTPUT_SURFACE_H_
 
 #define USE_CC_OUTPUT_SURFACE // TODO(danakj): Remove this.
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/software_output_device.h"
+#include "cc/output/software_output_device.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 
 namespace gfx {
 class Rect;
 class Size;
 }
 
 namespace cc {
 
 class CompositorFrame;
@@ skipping 73 matching lines @@
   scoped_ptr<WebKit::WebGraphicsContext3D> context3d_;
   scoped_ptr<cc::SoftwareOutputDevice> software_device_;
   bool has_gl_discard_backbuffer_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(OutputSurface);
 };
 
 }  // namespace cc
 
-#endif  // CC_OUTPUT_SURFACE_H_
+#endif  // CC_OUTPUT_OUTPUT_SURFACE_H_