Update from https://crrev.com/311076

ui/gfx/font_list_impl.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/gfx/font_list_impl.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 86 matching lines @@
 
 FontListImpl::FontListImpl(const std::vector<Font>& fonts)
     : fonts_(fonts),
       common_height_(-1),
       common_baseline_(-1),
       font_style_(-1),
       font_size_(-1) {
   DCHECK(!fonts.empty());
   font_style_ = fonts[0].GetStyle();
   font_size_ = fonts[0].GetFontSize();
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   for (size_t i = 1; i < fonts.size(); ++i) {
     DCHECK_EQ(fonts[i].GetStyle(), font_style_);
     DCHECK_EQ(fonts[i].GetFontSize(), font_size_);
   }
 #endif
 }
 
 FontListImpl::FontListImpl(const Font& font)
     : common_height_(-1),
       common_baseline_(-1),
@@ skipping 121 matching lines @@
     font_style_ = fonts_[0].GetStyle();
     font_size_ = fonts_[0].GetFontSize();
   } else {
     std::vector<std::string> font_names;
     ParseFontDescriptionString(font_description_string_, &font_names,
                                &font_style_, &font_size_);
   }
 }
 
 }  // namespace gfx