Revert of content: Fix Context creation logic in ContextProviderFactoryImpl.

content/browser/renderer_host/compositor_impl_android.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
 #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 109 matching lines @@
   void SetNeedsAnimate() override;
   void SetVisible(bool visible);
   void CreateLayerTreeHost();
 
   void HandlePendingOutputSurfaceRequest();
 
 #if defined(ENABLE_VULKAN)
   void CreateVulkanOutputSurface();
 #endif
   void CreateCompositorOutputSurface(
-      const scoped_refptr<cc::ContextProvider>& context_provider,
-      ui::ContextProviderFactory::ContextCreationResult result);
+      const scoped_refptr<cc::ContextProvider>& context_provider);
   void InitializeDisplay(
       std::unique_ptr<cc::OutputSurface> display_output_surface,
       scoped_refptr<cc::VulkanContextProvider> vulkan_context_provider,
       scoped_refptr<cc::ContextProvider> context_provider);
 
   bool HavePendingReadbacks();
 
   // root_layer_ is the persistent internal root layer, while subroot_layer_
   // is the one attached by the compositor client.
   scoped_refptr<cc::Layer> subroot_layer_;
@@ skipping 20 matching lines @@
 
   gfx::NativeWindow root_window_;
 
   // Whether we need to update animations on the next composite.
   bool needs_animate_;
 
   // The number of SwapBuffer calls that have not returned and ACK'd from
   // the GPU thread.
   unsigned int pending_swapbuffers_;
 
-  size_t num_successive_gpu_process_initialization_failures_;
   size_t num_successive_context_creation_failures_;
 
   // Whether there is an OutputSurface request pending from the current
   // |host_|. Becomes |true| if RequestNewOutputSurface is called, and |false|
   // if |host_| is deleted or we succeed in creating *and* initializing an
   // OutputSurface (which is essentially the contract with cc).
   bool output_surface_request_pending_;
 
   gpu::Capabilities gpu_capabilities_;
   bool needs_begin_frames_;
   base::WeakPtrFactory<CompositorImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorImpl);
 };
 
 } // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_