Fix some bugs in the HDR detection code

gpu/ipc/service/direct_composition_surface_win.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 "gpu/ipc/service/direct_composition_surface_win.h"
 
 #include <d3d11_1.h>
 #include <dcomptypes.h>
 
 #include <deque>
@@ skipping 981 matching lines @@
 // static
 bool DirectCompositionSurfaceWin::AreOverlaysSupported() {
   if (!HardwareSupportsOverlays())
     return false;
 
   return base::FeatureList::IsEnabled(switches::kDirectCompositionOverlays);
 }
 
 // static
 bool DirectCompositionSurfaceWin::IsHDRSupported() {
-  bool hdr_monitor_found = true;
+  bool hdr_monitor_found = false;
 #if defined(ENABLE_HDR_DETECTION)
   base::win::ScopedComPtr<ID3D11Device> d3d11_device =
       gl::QueryD3D11DeviceObjectFromANGLE();
   if (!d3d11_device) {
     DLOG(ERROR) << "Failing to detect HDR, couldn't retrieve D3D11 "
                 << "device from ANGLE.";
     return false;
   }
   base::win::ScopedComPtr<IDXGIDevice> dxgi_device;
   d3d11_device.CopyTo(dxgi_device.GetAddressOf());
@@ skipping 11 matching lines @@
 
     DXGI_OUTPUT_DESC1 desc;
     if (FAILED(output6->GetDesc1(&desc)))
       continue;
 
     UMA_HISTOGRAM_SPARSE_SLOWLY("GPU.Output.ColorSpace", desc.ColorSpace);
     UMA_HISTOGRAM_SPARSE_SLOWLY("GPU.Output.MaxLuminance", desc.MaxLuminance);
 
     if (desc.ColorSpace == DXGI_COLOR_SPACE_RGB_FULL_G2084_NONE_P2020) {
       hdr_monitor_found = true;
-      return true;
     }
   }
   UMA_HISTOGRAM_BOOLEAN("GPU.Output.HDR", hdr_monitor_found);
+#endif
   return hdr_monitor_found;
-#else
-  return false;
-#endif
 }
 
 bool DirectCompositionSurfaceWin::InitializeNativeWindow() {
   if (window_)
     return true;
 
   bool result = child_window_.Initialize();
   window_ = child_window_.window();
   return result;
 }
@@ skipping 166 matching lines @@
 DirectCompositionSurfaceWin::GetWindowTaskRunnerForTesting() {
   return child_window_.GetTaskRunnerForTesting();
 }
 
 base::win::ScopedComPtr<IDXGISwapChain1>
 DirectCompositionSurfaceWin::GetLayerSwapChainForTesting(size_t index) const {
   return layer_tree_->GetLayerSwapChainForTesting(index);
 }
 
 }  // namespace gpu