Revert of [Ozone-GBM] Handle GPU crashes

ui/ozone/platform/dri/chromeos/native_display_delegate_dri.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/ozone/platform/dri/chromeos/native_display_delegate_dri.h"
 
 #include "base/bind.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/display/types/chromeos/native_display_observer.h"
 #include "ui/events/ozone/device/device_event.h"
@@ skipping 34 matching lines @@
   }
 
   for (int i = 0; i < property->count_enums; ++i)
     if (name == property->enums[i].name)
       return i;
 
   NOTREACHED();
   return 0;
 }
 
-class DisplaySnapshotComparator {
- public:
-  DisplaySnapshotComparator(const DisplaySnapshotDri* snapshot)
-      : snapshot_(snapshot) {}
-
-  bool operator()(const DisplaySnapshotDri* other) const {
-    if (snapshot_->connector() == other->connector() &&
-        snapshot_->crtc() == other->crtc())
-      return true;
-
-    return false;
-  }
-
- private:
-  const DisplaySnapshotDri* snapshot_;
-};
-
 }  // namespace
 
 NativeDisplayDelegateDri::NativeDisplayDelegateDri(
     DriWrapper* dri,
     ScreenManager* screen_manager,
     DeviceManager* device_manager)
     : dri_(dri),
       screen_manager_(screen_manager),
       device_manager_(device_manager) {
 }
@@ skipping 216 matching lines @@
     VLOG(1) << "Got display changed event";
     FOR_EACH_OBSERVER(
         NativeDisplayObserver, observers_, OnConfigurationChanged());
   }
 }
 
 void NativeDisplayDelegateDri::NotifyScreenManager(
     const std::vector<DisplaySnapshotDri*>& new_displays,
     const std::vector<DisplaySnapshotDri*>& old_displays) const {
   for (size_t i = 0; i < old_displays.size(); ++i) {
-    const std::vector<DisplaySnapshotDri*>::const_iterator it =
-        std::find_if(new_displays.begin(),
-                     new_displays.end(),
-                     DisplaySnapshotComparator(old_displays[i]));
+    bool found = false;
+    for (size_t j = 0; j < new_displays.size(); ++j) {
+      if (old_displays[i]->connector() == new_displays[j]->connector() &&
+          old_displays[i]->crtc() == new_displays[j]->crtc()) {
+        found = true;
+        break;
+      }
+    }
 
-    if (it == new_displays.end())
+    if (!found)
       screen_manager_->RemoveDisplayController(old_displays[i]->crtc());
   }
-
-  for (size_t i = 0; i < new_displays.size(); ++i) {
-    const std::vector<DisplaySnapshotDri*>::const_iterator it =
-        std::find_if(old_displays.begin(),
-                     old_displays.end(),
-                     DisplaySnapshotComparator(new_displays[i]));
-
-    if (it == old_displays.end())
-      screen_manager_->AddDisplayController(new_displays[i]->crtc(),
-                                            new_displays[i]->connector());
-  }
 }
 
 }  // namespace ui