Revert of https://chromium.googlesource.com/chromium/src/+/d78b086e4459077f2f5ceac61c3a8b968eff6353

Patch seems to becausing a large number of GPU process crashes in the latest canary.

BUG=466735
TBR=jmadill

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

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

4 files changed, 14 insertions, 12 deletions

diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate
index aa24c23..84379d6 100644
--- a/content/content_browsertests.isolate
+++ b/content/content_browsertests.isolate
@@ -141,6 +141,5 @@
   'includes': [
     '../base/base.isolate',
     '../gin/v8.isolate',
-    '../third_party/angle/angle.isolate',
   ],
 }
diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi
index 1c2121d..af0c47f 100644
--- a/content/content_gpu.gypi
+++ b/content/content_gpu.gypi
@@ -26,10 +26,13 @@
     ['OS=="win"', {
       'include_dirs': [
         '<(DEPTH)/third_party/khronos',
-        # ANGLE libs picked up from ui/gl
         '<(angle_path)/src',
         '<(DEPTH)/third_party/wtl/include',
       ],
+      'dependencies': [
+        '<(angle_path)/src/angle.gyp:libEGL',
+        '<(angle_path)/src/angle.gyp:libGLESv2',
+      ],
       'link_settings': {
         'libraries': [
           '-lsetupapi.lib',
diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate
index 07ac6e7..f61a3e1 100644
--- a/content/content_unittests.isolate
+++ b/content/content_unittests.isolate
@@ -109,6 +109,5 @@
   'includes': [
     '../base/base.isolate',
     '../gin/v8.isolate',
-    '../third_party/angle/angle.isolate',
   ],
 }
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 76a6020..b34d42f 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -12,7 +12,6 @@
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
-#include "base/metrics/statistics_recorder.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
@@ -215,14 +214,14 @@ int GpuMain(const MainFunctionParams& parameters) {
     watchdog_thread->StartWithOptions(options);
   }
 
-  // Initializes StatisticsRecorder which tracks UMA histograms.
-  base::StatisticsRecorder::Initialize();
-
   gpu::GPUInfo gpu_info;
   // Get vendor_id, device_id, driver_version from browser process through
   // commandline switches.
   GetGpuInfoFromCommandLine(gpu_info, command_line);
 
+  base::TimeDelta collect_context_time;
+  base::TimeDelta initialize_one_off_time;
+
   // Warm up resources that don't need access to GPUInfo.
   if (WarmUpSandbox(command_line)) {
 #if defined(OS_LINUX)
@@ -294,18 +293,15 @@ int GpuMain(const MainFunctionParams& parameters) {
 #endif  // !defined(OS_CHROMEOS)
 #endif  // defined(OS_LINUX)
 #endif  // !defined(OS_MACOSX)
-      base::TimeDelta collect_context_time =
+      collect_context_time =
           base::TimeTicks::Now() - before_collect_context_graphics_info;
-      UMA_HISTOGRAM_TIMES("GPU.CollectContextGraphicsInfo",
-                          collect_context_time);
     } else {  // gl_initialized
       VLOG(1) << "gfx::GLSurface::InitializeOneOff failed";
       dead_on_arrival = true;
     }
 
-    base::TimeDelta initialize_one_off_time =
+    initialize_one_off_time =
         base::TimeTicks::Now() - before_initialize_one_off;
-    UMA_HISTOGRAM_TIMES("GPU.InitializeOneOffTime", initialize_one_off_time);
 
     if (enable_watchdog && delayed_watchdog_enable) {
       watchdog_thread = new GpuWatchdogThread(kGpuTimeout);
@@ -346,6 +342,11 @@ int GpuMain(const MainFunctionParams& parameters) {
 
   GpuProcess gpu_process;
 
+  // These UMA must be stored after GpuProcess is constructed as it
+  // initializes StatisticsRecorder which tracks the histograms.
+  UMA_HISTOGRAM_TIMES("GPU.CollectContextGraphicsInfo", collect_context_time);
+  UMA_HISTOGRAM_TIMES("GPU.InitializeOneOffTime", initialize_one_off_time);
+
   GpuChildThread* child_thread = new GpuChildThread(watchdog_thread.get(),
                                                     dead_on_arrival,
                                                     gpu_info,