Move //sky/compositor to //sky/viewer/compositor

sky/viewer/compositor/surface_holder.cc

 // Copyright 2014 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 "sky/compositor/surface_holder.h"
+#include "sky/viewer/compositor/surface_holder.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
-#include "sky/compositor/surface_allocator.h"
+#include "sky/viewer/compositor/surface_allocator.h"
 
 namespace sky {
 
 SurfaceHolder::Client::~Client() {
 }
 
 SurfaceHolder::SurfaceHolder(Client* client, mojo::Shell* shell)
     : client_(client),
       id_namespace_(0u),
       local_id_(0u),
@@ skipping 47 matching lines @@
   if (local_id_ != 0u)
     SetQualifiedId();
 }
 
 void SurfaceHolder::ReturnResources(
     mojo::Array<mojo::ReturnedResourcePtr> resources) {
   client_->ReturnResources(resources.Pass());
 }
 
 }  // namespace sky