Fix UBSan testing builds

chrome/browser/ui/views/chrome_views_delegate.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_CHROME_VIEWS_DELEGATE_H_
 #define CHROME_BROWSER_UI_VIEWS_CHROME_VIEWS_DELEGATE_H_
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
@@ skipping 45 matching lines @@
       views::Widget::InitParams* params,
       views::internal::NativeWidgetDelegate* delegate) override;
   ui::ContextFactory* GetContextFactory() override;
   ui::ContextFactoryPrivate* GetContextFactoryPrivate() override;
   std::string GetApplicationName() override;
   scoped_refptr<base::TaskRunner> GetBlockingPoolTaskRunner() override;
 
   gfx::Insets GetInsetsMetric(views::InsetsMetric metric) const override;
   int GetDistanceMetric(views::DistanceMetric metric) const override;
 
-  int GetDefaultDistanceMetric(views::DistanceMetric metric) const;
+  static int GetDefaultDistanceMetric(views::DistanceMetric metric);
 
  private:
 #if defined(OS_WIN)
   typedef std::map<HMONITOR, int> AppbarAutohideEdgeMap;
 
   // Callback on main thread with the edges. |returned_edges| is the value that
   // was returned from the call to GetAutohideEdges() that initiated the lookup.
   void OnGotAppbarAutohideEdges(const base::Closure& callback,
                                 HMONITOR monitor,
                                 int returned_edges,
                                 int edges);
 #endif
 
 #if defined(OS_CHROMEOS)
   // Called from GetSavedWindowPlacement() on ChromeOS to adjust the bounds.
   void AdjustSavedWindowPlacementChromeOS(const views::Widget* widget,
                                           gfx::Rect* bounds) const;
 #endif
 
+  int InternalGetDefaultDistanceMetric(views::DistanceMetric metric) const;
+
   // Function to retrieve default opacity value mainly based on platform
   // and desktop context.
   views::Widget::InitParams::WindowOpacity GetOpacityForInitParams(
       const views::Widget::InitParams& params);
 
   views::NativeWidget* CreateNativeWidget(
       views::Widget::InitParams* params,
       views::internal::NativeWidgetDelegate* delegate);
 
   // |ChromeViewsDelegate| exposes a |RefCounted|-like interface, but //chrome
   // uses |ScopedKeepAlive|s to manage lifetime. We manage an internal counter
   // to do that translation.
   unsigned int ref_count_ = 0u;
 
   std::unique_ptr<ScopedKeepAlive> keep_alive_;
 
 #if defined(OS_WIN)
   AppbarAutohideEdgeMap appbar_autohide_edge_map_;
   // If true we're in the process of notifying a callback from
   // GetAutohideEdges().start a new query.
   bool in_autohide_edges_callback_;
 
   base::WeakPtrFactory<ChromeViewsDelegate> weak_factory_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ChromeViewsDelegate);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_CHROME_VIEWS_DELEGATE_H_