[MD] Don't use new OTR native-theming when using a custom browser theme.

chrome/browser/ui/views/frame/browser_root_view.cc

Index: chrome/browser/ui/views/frame/browser_root_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_root_view.cc b/chrome/browser/ui/views/frame/browser_root_view.cc
index 5bf11e512452d63530bbdc39074ad5b826a90adb..7e467acdfdd7b91383e98a26e3f62be430314380 100644
--- a/chrome/browser/ui/views/frame/browser_root_view.cc
+++ b/chrome/browser/ui/views/frame/browser_root_view.cc
@@ -22,6 +22,14 @@
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/hit_test.h"
 
+#if defined(OS_LINUX)

[sky, 2016/01/27 03:07:31]

Do you really need these includes here?

[Evan Stade, 2016/01/28 00:08:44]

no, this is left over from a previous iteration of the patch. Removed.

+#include "ui/native_theme/native_theme_dark_aura.h"
+#endif
+
+#if defined(OS_WIN)
+#include "ui/native_theme/native_theme_dark_win.h"
+#endif
+
 // static
 const char BrowserRootView::kViewClassName[] =
     "browser/ui/views/frame/BrowserRootView";