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

ui/display/chromeos/x11/native_display_delegate_x11.cc

 // Copyright 2014 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/display/chromeos/x11/native_display_delegate_x11.h"
 
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/dpms.h>
 #include <X11/extensions/Xrandr.h>
@@ skipping 293 matching lines @@
                                           info.id)));
   }
 }
 
 DisplaySnapshotX11* NativeDisplayDelegateX11::InitDisplaySnapshot(
     RROutput output,
     XRROutputInfo* info,
     std::set<RRCrtc>* last_used_crtcs,
     int index) {
   int64_t display_id = 0;
-  ui::EDIDParserX11 edid_parser(output);
-  if (!edid_parser.GetDisplayId(static_cast<uint8_t>(index), &display_id))
+  if (!GetDisplayId(output, static_cast<uint8_t>(index), &display_id))
     display_id = index;
 
   bool has_overscan = false;
-  edid_parser.GetOutputOverscanFlag(&has_overscan);
+  GetOutputOverscanFlag(output, &has_overscan);
 
   DisplayConnectionType type = GetDisplayConnectionTypeFromName(info->name);
   if (type == DISPLAY_CONNECTION_TYPE_UNKNOWN)
     LOG(ERROR) << "Unknown link type: " << info->name;
 
   RRMode native_mode_id = GetOutputNativeMode(info);
   RRMode current_mode_id = None;
   gfx::Point origin;
   if (info->crtc) {
     XRRCrtcInfo* crtc_info =
@@ skipping 31 matching lines @@
     }
   }
 
   DisplaySnapshotX11* display_snapshot =
       new DisplaySnapshotX11(display_id,
                              origin,
                              gfx::Size(info->mm_width, info->mm_height),
                              type,
                              IsOutputAspectPreservingScaling(output),
                              has_overscan,
-                             edid_parser.GetDisplayName(),
+                             GetDisplayName(output),
                              display_modes,
-                             edid_parser.edid(),
                              current_mode,
                              native_mode,
                              output,
                              crtc,
                              index);
 
   VLOG(1) << "Found display " << cached_outputs_.size() << ":"
           << " output=" << output << " crtc=" << crtc
           << " current_mode=" << current_mode_id;
 
@@ skipping 268 matching lines @@
   XSetForeground(display_, gc, color.pixel);
   XSetFillStyle(display_, gc, FillSolid);
   int width = DisplayWidth(display_, DefaultScreen(display_));
   int height = DisplayHeight(display_, DefaultScreen(display_));
   XFillRectangle(display_, window_, gc, 0, 0, width, height);
   XFreeGC(display_, gc);
   XFreeColors(display_, colormap, &color.pixel, 1, 0);
 }
 
 }  // namespace ui