Get rid of GL string cache on non-Android platform

and no longer blacklist GPU access if preliminary GPU feature decisions differ
from full info decisions.

The reason we can do this now, is because the only GPU feature check that's not
from GPU process is kDisableAcceleratedVideoDecode on Android. There is no
decision difference on Android between preliminary and full info.

This should get quite a few Windows machines putting to SwiftShader back to
GPU acceleration.

BUG=744658,764290,766190,774000,793845
TEST=bots
[email protected],[email protected]

Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I3fae7ff326a9cf2ea5b23c56261cb3139416a38f
Reviewed-on: https://chromium-review.googlesource.com/828040
Commit-Queue: Zhenyao Mo <[email protected]>
Reviewed-by: Lei Zhang <[email protected]>
Reviewed-by: Antoine Labour <[email protected]>
Reviewed-by: Kenneth Russell <[email protected]>
Cr-Commit-Position: refs/heads/master@{#524497}
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 575f8d0..8002e031 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -49,7 +49,6 @@
 #include "chrome/browser/download/download_request_limiter.h"
 #include "chrome/browser/download/download_status_updater.h"
 #include "chrome/browser/gpu/gpu_mode_manager.h"
-#include "chrome/browser/gpu/gpu_profile_cache.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/intranet_redirect_detector.h"
 #include "chrome/browser/io_thread.h"
@@ -183,6 +182,7 @@
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/android/physical_web/physical_web_data_source_android.h"
+#include "chrome/browser/gpu/gpu_driver_info_manager_android.h"
 #endif
 
 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
@@ -678,12 +678,14 @@
   return icon_manager_.get();
 }
 
-GpuProfileCache* BrowserProcessImpl::gpu_profile_cache() {
+#if defined(OS_ANDROID)
+GpuDriverInfoManager* BrowserProcessImpl::gpu_driver_info_manager() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  if (!gpu_profile_cache_)
-    gpu_profile_cache_ = GpuProfileCache::Create();
-  return gpu_profile_cache_.get();
+  if (!gpu_driver_info_manager_)
+    gpu_driver_info_manager_ = GpuDriverInfoManager::Create();
+  return gpu_driver_info_manager_.get();
 }
+#endif
 
 GpuModeManager* BrowserProcessImpl::gpu_mode_manager() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);