Move attributes and context type out to ContextProviderCommandBuffer.

content/common/gpu/client/context_provider_command_buffer.h

 // Copyright (c) 2013 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.
 
 #ifndef CONTENT_COMMON_GPU_CLIENT_CONTEXT_PROVIDER_COMMAND_BUFFER_H_
 #define CONTENT_COMMON_GPU_CLIENT_CONTEXT_PROVIDER_COMMAND_BUFFER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 22 matching lines @@
 namespace content {
 
 // Implementation of cc::ContextProvider that provides a
 // WebGraphicsContext3DCommandBufferImpl context and a GrContext.
 class CONTENT_EXPORT ContextProviderCommandBuffer
     : NON_EXPORTED_BASE(public cc::ContextProvider) {
  public:
   ContextProviderCommandBuffer(
       std::unique_ptr<WebGraphicsContext3DCommandBufferImpl> context3d,
       const gpu::SharedMemoryLimits& memory_limits,
+      const gpu::gles2::ContextCreationAttribHelper& attributes,
       ContextProviderCommandBuffer* shared_context_provider,
-      CommandBufferContextType type);
+      command_buffer_metrics::ContextType type);
 
   gpu::CommandBufferProxyImpl* GetCommandBufferProxy();
 
   // cc::ContextProvider implementation.
   bool BindToCurrentThread() override;
   void DetachFromThread() override;
   gpu::gles2::GLES2Interface* ContextGL() override;
   gpu::ContextSupport* ContextSupport() override;
   class GrContext* GrContext() override;
   void InvalidateGrContext(uint32_t state) override;
@@ skipping 24 matching lines @@
   base::ThreadChecker main_thread_checker_;
   base::ThreadChecker context_thread_checker_;
 
   scoped_refptr<SharedProviders> shared_providers_;
 
   std::unique_ptr<WebGraphicsContext3DCommandBufferImpl> context3d_;
   std::unique_ptr<gpu::gles2::GLES2TraceImplementation> trace_impl_;
   std::unique_ptr<skia_bindings::GrContextForGLES2Interface> gr_context_;
 
   gpu::SharedMemoryLimits memory_limits_;
-  CommandBufferContextType context_type_;
-  std::string debug_name_;
+  gpu::gles2::ContextCreationAttribHelper attributes_;
+  command_buffer_metrics::ContextType context_type_;
 
   LostContextCallback lost_context_callback_;
 
   base::Lock context_lock_;
 
   class LostContextCallbackProxy;
   std::unique_ptr<LostContextCallbackProxy> lost_context_callback_proxy_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_CLIENT_CONTEXT_PROVIDER_COMMAND_BUFFER_H_