Remove Rappor metrics that have already been deleted from the xml.

Remove some stale includes for already deleted metrics.

Bug: 1016906
Change-Id: I8d6c33953df5caf367a33b9a0260b5a36d6ab754
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1876787Reviewed-by: Navid Zolghadr <nzolghadr@chromium.org>
Reviewed-by: Steven Holte <holte@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Commit-Queue: Robert Kaplow <rkaplow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711025}

chrome/browser/extensions/chrome_extension_web_contents_observer.cc

@@ -4,6 +4,9 @@
 
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 
+#include <memory>
+#include <string>
+
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "chrome/browser/browser_process.h"
@@ -12,7 +15,6 @@
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/common/url_constants.h"
-#include "components/rappor/rappor_service_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/navigation_handle.h"

content/browser/renderer_host/input/render_widget_host_latency_tracker.cc

@@ -5,12 +5,12 @@
 #include "content/browser/renderer_host/input/render_widget_host_latency_tracker.h"
 
 #include <stddef.h>
+#include <string>
 
 #include "base/logging.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
 #include "build/build_config.h"
-#include "components/rappor/public/rappor_utils.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
@@ -114,7 +114,7 @@ void RenderWidgetHostLatencyTracker::OnInputEvent(
   if (event.GetType() == WebInputEvent::kTouchStart) {
     const WebTouchEvent& touch_event =
         *static_cast<const WebTouchEvent*>(&event);
-    DCHECK(touch_event.touches_length >= 1);
+    DCHECK_GE(touch_event.touches_length, static_cast<unsigned>(1));
     active_multi_finger_gesture_ = touch_event.touches_length != 1;
   }
 

content/browser/renderer_host/input/render_widget_host_latency_tracker_unittest.cc

@@ -4,11 +4,12 @@
 
 #include "content/browser/renderer_host/input/render_widget_host_latency_tracker.h"
 
+#include <memory>
+#include <string>
+
 #include "base/metrics/metrics_hashes.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "build/build_config.h"
-#include "components/rappor/public/rappor_utils.h"
-#include "components/rappor/test_rappor_service.h"
 #include "components/ukm/test_ukm_recorder.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/input/synthetic_web_input_event_builders.h"