Revert of Give user ability to file a feedback report from the display error notification.

ui/views/widget/desktop_aura/desktop_screen_x11.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/widget/desktop_aura/desktop_screen_x11.h"
 
 #include <X11/extensions/Xrandr.h>
 #include <X11/Xlib.h>
 
 // It clashes with out RootWindow.
@@ skipping 292 matching lines @@
     bool is_connected = (output_info->connection == RR_Connected);
     if (!is_connected)
       continue;
 
     if (output_info->crtc) {
       gfx::XScopedPtr<XRRCrtcInfo,
                       gfx::XObjectDeleter<XRRCrtcInfo, void, XRRFreeCrtcInfo>>
           crtc(XRRGetCrtcInfo(xdisplay_, resources.get(), output_info->crtc));
 
       int64_t display_id = -1;
-      if (!ui::EDIDParserX11(output_id).GetDisplayId(static_cast<uint8_t>(i),
-                                                     &display_id)) {
+      if (!ui::GetDisplayId(output_id, static_cast<uint8_t>(i), &display_id)) {
         // It isn't ideal, but if we can't parse the EDID data, fallback on the
         // display number.
         display_id = i;
       }
 
       gfx::Rect crtc_bounds(crtc->x, crtc->y, crtc->width, crtc->height);
       gfx::Display display(display_id, crtc_bounds);
 
       if (!gfx::Display::HasForceDeviceScaleFactor()) {
         display.SetScaleAndBounds(device_scale_factor, crtc_bounds);
@@ skipping 43 matching lines @@
   change_notifier_.NotifyDisplaysChanged(old_displays, displays_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 gfx::Screen* CreateDesktopScreen() {
   return new DesktopScreenX11;
 }
 
 }  // namespace views