Move attributes and context type out to ContextProviderCommandBuffer.

content/browser/renderer_host/compositor_impl_android.cc

 // Copyright (c) 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.
 
 #include "content/browser/renderer_host/compositor_impl_android.h"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 #include <stdint.h>
 
@@ skipping 554 matching lines @@
   // any excess space.
   limits.start_transfer_buffer_size = 64 * 1024;
   limits.min_transfer_buffer_size = 64 * 1024;
   limits.max_transfer_buffer_size = full_screen_texture_size_in_bytes;
   // Texture uploads may use mapped memory so give a reasonable limit for them.
   limits.mapped_memory_reclaim_limit = full_screen_texture_size_in_bytes;
 
   scoped_refptr<ContextProviderCommandBuffer> context_provider(
       new ContextProviderCommandBuffer(
           base::WrapUnique(new WebGraphicsContext3DCommandBufferImpl(
-              surface_handle_, url, gpu_channel_host.get(), attributes,
+              surface_handle_, url, gpu_channel_host.get(),
               gfx::PreferIntegratedGpu, automatic_flushes)),
-          limits, nullptr, DISPLAY_COMPOSITOR_ONSCREEN_CONTEXT));
+          limits, attributes, nullptr,
+          command_buffer_metrics::DISPLAY_COMPOSITOR_ONSCREEN_CONTEXT));
   DCHECK(context_provider.get());
 
   std::unique_ptr<cc::OutputSurface> real_output_surface(
       new OutputSurfaceWithoutParent(
           this, context_provider,
           base::Bind(&CompositorImpl::PopulateGpuCapabilities,
                      base::Unretained(this)),
           base::WrapUnique(new ExternalBeginFrameSource(this))));
 
   cc::SurfaceManager* manager = GetSurfaceManager();
@@ skipping 92 matching lines @@
 void CompositorImpl::SetNeedsAnimate() {
   needs_animate_ = true;
   if (!host_->visible())
     return;
 
   TRACE_EVENT0("compositor", "Compositor::SetNeedsAnimate");
   host_->SetNeedsAnimate();
 }
 
 }  // namespace content