Update from chromium https://crrev.com/301725/

sky/viewer/platform/weblayertreeview_impl.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/viewer/platform/weblayertreeview_impl.h"
 
 #include "base/message_loop/message_loop_proxy.h"
 #include "cc/layers/layer.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/trees/layer_tree_host.h"
@@ skipping 21 matching lines @@
       base::Bind(&WebLayerTreeViewImpl::OnSurfaceConnectionCreated,
                  main_thread_bound_weak_ptr_));
 
   cc::LayerTreeSettings settings;
 
   // For web contents, layer transforms should scale up the contents of layers
   // to keep content always crisp when possible.
   settings.layer_transforms_should_scale_layer_contents = true;
 
   cc::SharedBitmapManager* shared_bitmap_manager = NULL;
-  cc::GpuMemoryBufferManager* gpu_memory_buffer_manager = NULL;
+  gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager = NULL;
 
   layer_tree_host_ =
       cc::LayerTreeHost::CreateThreaded(this,
                                         shared_bitmap_manager,
                                         gpu_memory_buffer_manager,
                                         settings,
                                         base::MessageLoopProxy::current(),
                                         compositor_message_loop_proxy);
   DCHECK(layer_tree_host_);
 }
@@ skipping 156 matching lines @@
       base::Bind(&WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread,
                  main_thread_bound_weak_ptr_,
                  id));
 }
 
 void WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread(cc::SurfaceId id) {
   view_->SetSurfaceId(mojo::SurfaceId::From(id));
 }
 
 }  // namespace sky