Revert of Allow WebGL on Android if the GPU has it's own process (patchset #6 id:100001 of https://codereview.chromium.org/1247093006/)

Reason for revert:
Change suspected to have caused the Android builders to start failing the following tests:

WebglConformance.conformance_attribs_gl_enable_vertex_attrib
WebglConformance.conformance_attribs_gl_vertex_attrib
WebglConformance.conformance_attribs_gl_vertexattribpointer
WebglConformance.conformance_attribs_gl_vertexattribpointer_offsets
WebglConformance.conformance_attribs_gl_vertex_attrib_zero_issues
WebglConformance.conformance_buffers_buffer_bind_test
WebglConformance.conformance_buffers_buffer_data_array_buffer
WebglConformance.conformance_buffers_index_validation_copies_indices
WebglConformance.conformance_buffers_index_validation_crash_with_buffer_sub_data
WebglConformance.conformance_buffers_index_validation_verifies_too_many_indices
WebglConformance.conformance_buffers_index_validation_with_resized_buffer

See build logs:
https://build.chromium.org/p/chromium.gpu/builders/Android%20Debug%20%28Nexus%205%29/builds/1179
https://build.chromium.org/p/chromium.gpu/builders/Android%20Debug%20%28Nexus%206%29/builds/1475
https://build.chromium.org/p/chromium.gpu/builders/Android%20Debug%20%28Nexus%209%29/builds/1306

Original issue's description:
> Allow WebGL on Android if the GPU has it's own process
>
> BUG=512992
>
> Committed: https://crrev.com/29443deeb43de94ed4c8cd38329f1527e4641d03
> Cr-Commit-Position: refs/heads/master@{#340198}

TBR=aelias@chromium.org,kbr@chromium.org,mkwst@chromium.org,zmo@chromium.org,bajones@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=512992

Review URL: https://codereview.chromium.org/1252293002

Cr-Commit-Position: refs/heads/master@{#340244}

7 files changed, 13 insertions, 59 deletions

diff --git a/gpu/config/gpu_control_list.cc b/gpu/config/gpu_control_list.cc
index 1fbf0b6..401379d 100644
--- a/gpu/config/gpu_control_list.cc
+++ b/gpu/config/gpu_control_list.cc
@@ -723,12 +723,6 @@ GpuControlList::GpuControlListEntry::GetEntryFromValue(
     dictionary_entry_count++;
   }
 
-  bool in_process_gpu;
-  if (value->GetBoolean("in_process_gpu", &in_process_gpu)) {
-    entry->SetInProcessGPUInfo(in_process_gpu);
-    dictionary_entry_count++;
-  }
-
   if (top_level) {
     const base::ListValue* feature_value = NULL;
     if (value->GetList("features", &feature_value)) {
@@ -986,10 +980,6 @@ void GpuControlList::GpuControlListEntry::SetDirectRenderingInfo(bool value) {
   direct_rendering_info_.reset(new BoolInfo(value));
 }
 
-void GpuControlList::GpuControlListEntry::SetInProcessGPUInfo(bool value) {
-  in_process_gpu_info_.reset(new BoolInfo(value));
-}
-
 bool GpuControlList::GpuControlListEntry::SetFeatures(
     const std::vector<std::string>& feature_strings,
     const FeatureMap& feature_map,
@@ -1253,9 +1243,6 @@ bool GpuControlList::GpuControlListEntry::Contains(
   if (direct_rendering_info_.get() != NULL &&
       !direct_rendering_info_->Contains(gpu_info.direct_rendering))
     return false;
-  if (in_process_gpu_info_.get() != NULL &&
-      !in_process_gpu_info_->Contains(gpu_info.in_process_gpu))
-    return false;
   if (!cpu_brand_.empty()) {
     base::CPU cpu_info;
     if (StringMismatch(cpu_info.cpu_brand(), cpu_brand_))
diff --git a/gpu/config/gpu_control_list.h b/gpu/config/gpu_control_list.h
index ec83b04..3249415 100644
--- a/gpu/config/gpu_control_list.h
+++ b/gpu/config/gpu_control_list.h
@@ -400,7 +400,6 @@ class GPU_EXPORT GpuControlList {
                          const std::string& int_string2);
 
     void SetDirectRenderingInfo(bool value);
-    void SetInProcessGPUInfo(bool value);
 
     bool SetFeatures(const std::vector<std::string>& features,
                      const FeatureMap& feature_map,
@@ -457,7 +456,6 @@ class GPU_EXPORT GpuControlList {
     scoped_ptr<VersionInfo> machine_model_version_info_;
     scoped_ptr<IntInfo> gpu_count_info_;
     scoped_ptr<BoolInfo> direct_rendering_info_;
-    scoped_ptr<BoolInfo> in_process_gpu_info_;
     std::set<int> features_;
     std::vector<ScopedGpuControlListEntry> exceptions_;
   };
diff --git a/gpu/config/gpu_control_list_unittest.cc b/gpu/config/gpu_control_list_unittest.cc
index 402998b..88452fc 100644
--- a/gpu/config/gpu_control_list_unittest.cc
+++ b/gpu/config/gpu_control_list_unittest.cc
@@ -627,39 +627,4 @@ TEST_F(GpuControlListTest, DisabledExtensionTest) {
   ASSERT_STREQ("test_extension3", disabled_extensions[2].c_str());
 }
 
-TEST_F(GpuControlListTest, DisabledInProcessGPUTest) {
-  const std::string exact_list_json = LONG_STRING_CONST(
-      {
-        "name": "gpu control list",
-        "version": "0.1",
-        "entries": [
-          {
-            "id": 1,
-            "os": {
-              "type": "win"
-            },
-            "in_process_gpu": true,
-            "features": [
-              "test_feature_0"
-            ]
-          }
-        ]
-      }
-  );
-  scoped_ptr<GpuControlList> control_list(Create());
-
-  EXPECT_TRUE(control_list->LoadList(exact_list_json, GpuControlList::kAllOs));
-  GPUInfo gpu_info;
-
-  gpu_info.in_process_gpu = true;
-  std::set<int> features = control_list->MakeDecision(
-        GpuControlList::kOsWin, kOsVersion, gpu_info);
-  EXPECT_SINGLE_FEATURE(features, TEST_FEATURE_0);
-
-  gpu_info.in_process_gpu = false;
-  features = control_list->MakeDecision(
-        GpuControlList::kOsWin, kOsVersion, gpu_info);
-  EXPECT_EMPTY_SET(features);
-}
-
 }  // namespace gpu
diff --git a/gpu/config/gpu_info.cc b/gpu/config/gpu_info.cc
index 23d5216..e46ff84 100644
--- a/gpu/config/gpu_info.cc
+++ b/gpu/config/gpu_info.cc
@@ -65,7 +65,6 @@ GPUInfo::GPUInfo()
       direct_rendering(true),
       sandboxed(false),
       process_crash_count(0),
-      in_process_gpu(true),
       basic_info_state(kCollectInfoNone),
       context_info_state(kCollectInfoNone),
 #if defined(OS_WIN)
@@ -107,7 +106,6 @@ void GPUInfo::EnumerateFields(Enumerator* enumerator) const {
     bool direct_rendering;
     bool sandboxed;
     int process_crash_count;
-    bool in_process_gpu;
     CollectInfoResult basic_info_state;
     CollectInfoResult context_info_state;
 #if defined(OS_WIN)
@@ -168,7 +166,6 @@ void GPUInfo::EnumerateFields(Enumerator* enumerator) const {
   enumerator->AddBool("directRendering", direct_rendering);
   enumerator->AddBool("sandboxed", sandboxed);
   enumerator->AddInt("processCrashCount", process_crash_count);
-  enumerator->AddBool("inProcessGpu", in_process_gpu);
   enumerator->AddInt("basicInfoState", basic_info_state);
   enumerator->AddInt("contextInfoState", context_info_state);
 #if defined(OS_WIN)
diff --git a/gpu/config/gpu_info.h b/gpu/config/gpu_info.h
index d6f61fd..ab7f7ad 100644
--- a/gpu/config/gpu_info.h
+++ b/gpu/config/gpu_info.h
@@ -206,9 +206,6 @@ struct GPU_EXPORT GPUInfo {
   // Number of GPU process crashes recorded.
   int process_crash_count;
 
-  // True if the GPU is running in the browser process instead of its own.
-  bool in_process_gpu;
-
   // The state of whether the basic/context/DxDiagnostics info is collected and
   // if the collection fails or not.
   CollectInfoResult basic_info_state;
diff --git a/gpu/config/gpu_info_collector.cc b/gpu/config/gpu_info_collector.cc
index 56f286b..d156daa 100644
--- a/gpu/config/gpu_info_collector.cc
+++ b/gpu/config/gpu_info_collector.cc
@@ -160,7 +160,6 @@ void MergeGPUInfoGL(GPUInfo* basic_gpu_info,
   basic_gpu_info->can_lose_context = context_gpu_info.can_lose_context;
   basic_gpu_info->sandboxed = context_gpu_info.sandboxed;
   basic_gpu_info->direct_rendering = context_gpu_info.direct_rendering;
-  basic_gpu_info->in_process_gpu = context_gpu_info.in_process_gpu;
   basic_gpu_info->context_info_state = context_gpu_info.context_info_state;
   basic_gpu_info->initialization_time = context_gpu_info.initialization_time;
   basic_gpu_info->video_decode_accelerator_supported_profiles =
diff --git a/gpu/config/software_rendering_list_json.cc b/gpu/config/software_rendering_list_json.cc
index b0b7277..a4cf2b0 100644
--- a/gpu/config/software_rendering_list_json.cc
+++ b/gpu/config/software_rendering_list_json.cc
@@ -733,11 +733,22 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
 LONG_STRING_CONST(
     {
       "id": 76,
-      "description": "WebGL is disabled on Android unless the GPU runs in a separate process",
+      "description": "WebGL is disabled on Android unless GPU reset notification is supported",
       "os": {
         "type": "android"
       },
-      "in_process_gpu": true,
+      "exceptions": [
+        {
+          "gl_reset_notification_strategy": {
+            "op": "=",
+            "value": "33362"
+          }
+        },
+        {
+          "gl_renderer": "Mali-400.*",
+          "gl_extensions": ".*EXT_robustness.*"
+        }
+      ],
       "features": [
         "webgl"
       ]