chromeos: Fix handling of null in NativeDisplayDelegate

services/ui/display/screen_manager_forwarding.cc

 // Copyright 2017 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 "services/ui/display/screen_manager_forwarding.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "services/service_manager/public/cpp/bind_source_info.h"
@@ skipping 99 matching lines @@
 
 void ScreenManagerForwarding::GetDisplays(const GetDisplaysCallback& callback) {
   DCHECK(native_display_delegate_);
   native_display_delegate_->GetDisplays(
       base::Bind(&ScreenManagerForwarding::ForwardGetDisplays,
                  base::Unretained(this), callback));
 }
 
 void ScreenManagerForwarding::Configure(
     int64_t display_id,
-    std::unique_ptr<display::DisplayMode> mode,
+    base::Optional<std::unique_ptr<display::DisplayMode>> mode,
     const gfx::Point& origin,
     const ConfigureCallback& callback) {
   DCHECK(native_display_delegate_);
   DisplaySnapshot* snapshot = snapshot_map_[display_id];
   if (!snapshot) {
     callback.Run(false);
     return;
   }
 
   // We need a pointer to the mode in |snapshot|, not the equivalent mode we
   // received over Mojo.
   const DisplayMode* snapshot_mode =
-      GetCorrespondingMode(*snapshot, mode.get());
+      mode ? GetCorrespondingMode(*snapshot, mode->get()) : nullptr;
   native_display_delegate_->Configure(
       *snapshot, snapshot_mode, origin,
       base::Bind(&ScreenManagerForwarding::ForwardConfigure,
                  base::Unretained(this), snapshot, snapshot_mode, origin,
                  callback));
 }
 
 void ScreenManagerForwarding::GetHDCPState(
     int64_t display_id,
     const GetHDCPStateCallback& callback) {
@@ skipping 67 matching lines @@
   if (status) {
     // Modify display snapshot similar to how ConfigureDisplaysTask would. Ozone
     // DRM needs these to be changed and ConfigureDisplaysTasks can't do it.
     snapshot->set_current_mode(mode);
     snapshot->set_origin(origin);
   }
   callback.Run(status);
 }
 
 }  // namespace display