Part 4 of cc/ directory shuffles: output

cc/output/output_surface.h

Index: cc/output/output_surface.h
diff --git a/cc/output_surface.h b/cc/output/output_surface.h
similarity index 95%
rename from cc/output_surface.h
rename to cc/output/output_surface.h
index 9bfbc0853c285d9166d610888b9a7717609faad1..ce425eda0c61712edc6510f484467d7bea58e75a 100644
--- a/cc/output_surface.h
+++ b/cc/output/output_surface.h
@@ -2,15 +2,15 @@
 // 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 {
@@ -104,4 +104,4 @@ class CC_EXPORT OutputSurface {
 
 }  // namespace cc
 
-#endif  // CC_OUTPUT_SURFACE_H_
+#endif  // CC_OUTPUT_OUTPUT_SURFACE_H_