Mac: Towards moving CALayerTree to the browser proc

ui/accelerated_widget_mac/ca_layer_tree_mac.mm

 // Copyright 2016 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 "gpu/ipc/service/ca_layer_tree_mac.h"
+#include "ui/accelerated_widget_mac/ca_layer_tree_mac.h"
 
 #include <AVFoundation/AVFoundation.h>
 #include <CoreMedia/CoreMedia.h>
 #include <CoreVideo/CoreVideo.h>
+#include <GLES2/gl2extchromium.h>
 
 #include "base/command_line.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/trace_event/trace_event.h"
-#include "gpu/GLES2/gl2extchromium.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/cocoa/animation_utils.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/geometry/dip_util.h"
 
 #if !defined(MAC_OS_X_VERSION_10_8) || \
     MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_8
 extern NSString* const AVLayerVideoGravityResize;
 extern "C" void NSAccessibilityPostNotificationWithUserInfo(
     id object,
@@ skipping 12 matching lines @@
                                                               Boolean);
 extern "C" OSStatus CMVideoFormatDescriptionCreateForImageBuffer(
     CFAllocatorRef,
     CVImageBufferRef,
     CMVideoFormatDescriptionRef*);
 extern "C" CMTime CMTimeMake(int64_t, int32_t);
 extern CFStringRef const kCMSampleAttachmentKey_DisplayImmediately;
 extern const CMTime kCMTimeInvalid;
 #endif  // MAC_OS_X_VERSION_10_8
 
-namespace gpu {
+namespace ui {
 
 namespace {
 
 // This will enqueue |io_surface| to be drawn by |av_layer| by wrapping
 // |io_surface| in a CVPixelBuffer. This will increase the in-use count
 // of and retain |io_surface| until it is no longer being displayed.
 bool AVSampleBufferDisplayLayerEnqueueIOSurface(
     AVSampleBufferDisplayLayer* av_layer,
     IOSurfaceRef io_surface) {
   OSStatus os_status = noErr;
@@ skipping 503 matching lines @@
       }
     } else {
       // Grey represents a CALayer that has not changed.
       color.reset(CGColorCreateGenericRGB(0, 0, 0, 0.1));
     }
     [ca_layer setBorderWidth:1];
     [ca_layer setBorderColor:color];
   }
 }
 
-}  // namespace gpu
+}  // namespace ui