Revert of "gpu: Nexus5 and ANGLE crashes with GL_TEXTURE_CUBE_MAP_NEGATIVE_X"

gpu/command_buffer/service/texture_manager.h

Index: gpu/command_buffer/service/texture_manager.h
diff --git a/gpu/command_buffer/service/texture_manager.h b/gpu/command_buffer/service/texture_manager.h
index 595f0354486f282593e81812d78edef395125891..e97feb327f1c5a37b6edc98fd1d4a39c21885657 100644
--- a/gpu/command_buffer/service/texture_manager.h
+++ b/gpu/command_buffer/service/texture_manager.h
@@ -14,7 +14,6 @@
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "gpu/command_buffer/service/async_pixel_transfer_delegate.h"
-#include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/command_buffer/service/memory_tracking.h"
 #include "gpu/gpu_export.h"
@@ -533,13 +532,10 @@
 struct DecoderTextureState {
   // total_texture_upload_time automatically initialized to 0 in default
   // constructor.
-  explicit DecoderTextureState(const FeatureInfo::Workarounds& workarounds)
+  explicit DecoderTextureState(bool texsubimage_faster_than_teximage)
       : tex_image_failed(false),
         texture_upload_count(0),
-        texsubimage_faster_than_teximage(
-            workarounds.texsubimage_faster_than_teximage),
-        force_cube_map_positive_x_allocation(
-            workarounds.force_cube_map_positive_x_allocation) {}
+        texsubimage_faster_than_teximage(texsubimage_faster_than_teximage) {}
 
   // This indicates all the following texSubImage*D calls that are part of the
   // failed texImage*D call should be ignored. The client calls have a lock
@@ -552,7 +548,6 @@
   base::TimeDelta total_texture_upload_time;
 
   bool texsubimage_faster_than_teximage;
-  bool force_cube_map_positive_x_allocation;
 };
 
 // This class keeps track of the textures and their sizes so we can do NPOT and
@@ -893,14 +888,6 @@
     TextureRef* texture_ref,
     const DoTexImageArguments& args);
 
-  void DoTexImage2DCubeMapPositiveXIfNeeded(
-      DecoderTextureState* texture_state,
-      ErrorState* error_state,
-      DecoderFramebufferState* framebuffer_state,
-      const char* function_name,
-      TextureRef* texture_ref,
-      const DoTexImageArguments& args);
-
   void StartTracking(TextureRef* texture);
   void StopTracking(TextureRef* texture);