Move SetUseOverrideRedirectWindowByDefault() to //ui/base.

ui/platform_window/x11/x11_window_base.cc

 // Copyright 2016 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/platform_window/x11/x11_window_base.h"
 
 #include <X11/extensions/XInput2.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
 #include <string>
 
 #include "base/strings/utf_string_conversions.h"
+#include "ui/base/platform_window_defaults.h"
 #include "ui/base/x/x11_window_event_manager.h"
 #include "ui/events/devices/x11/touch_factory_x11.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/events/platform/x11/x11_event_source.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/platform_window/platform_window_delegate.h"
 
 namespace ui {
 
 namespace {
 
 const char* kAtomsToCache[] = {"UTF8_STRING",  "WM_DELETE_WINDOW",
                                "_NET_WM_NAME", "_NET_WM_PID",
                                "_NET_WM_PING", NULL};
 
-bool g_override_redirect = false;
-
 XID FindXEventTarget(const XEvent& xev) {
   XID target = xev.xany.window;
   if (xev.type == GenericEvent)
     target = static_cast<XIDeviceEvent*>(xev.xcookie.data)->event;
   return target;
 }
 
 }  // namespace
 
 X11WindowBase::X11WindowBase(PlatformWindowDelegate* delegate,
@@ skipping 26 matching lines @@
   XDestroyWindow(xdisplay, xwindow);
 }
 
 void X11WindowBase::Create() {
   DCHECK(!bounds_.size().IsEmpty());
 
   XSetWindowAttributes swa;
   memset(&swa, 0, sizeof(swa));
   swa.background_pixmap = None;
   swa.bit_gravity = NorthWestGravity;
-  swa.override_redirect = g_override_redirect;
+  swa.override_redirect = UseTestConfigForPlatformWindows();
   xwindow_ =
       XCreateWindow(xdisplay_, xroot_window_, bounds_.x(), bounds_.y(),
                     bounds_.width(), bounds_.height(),
                     0,               // border width
                     CopyFromParent,  // depth
                     InputOutput,
                     CopyFromParent,  // visual
                     CWBackPixmap | CWBitGravity | CWOverrideRedirect, &swa);
 
   // Setup XInput event mask.
@@ skipping 205 matching lines @@
         XSendEvent(xdisplay_, reply_event.xclient.window, False,
                    SubstructureRedirectMask | SubstructureNotifyMask,
                    &reply_event);
         XFlush(xdisplay_);
       }
       break;
     }
   }
 }
 
-namespace test {
-
-void SetUseOverrideRedirectWindowByDefault(bool override_redirect) {
-  g_override_redirect = override_redirect;
-}
-
-}  // namespace test
 }  // namespace ui