Merge the LinuxUI interface from its own .so into libviews.so.

chrome/browser/ui/views/status_icons/status_tray_linux.cc

Index: chrome/browser/ui/views/status_icons/status_tray_linux.cc
diff --git a/chrome/browser/ui/views/status_icons/status_tray_linux.cc b/chrome/browser/ui/views/status_icons/status_tray_linux.cc
index 58db07adeaf0eb5dda730ab32a8517abb6605afe..548263437cec4a6c5e1d3cb1d5b6150b6b486987 100644
--- a/chrome/browser/ui/views/status_icons/status_tray_linux.cc
+++ b/chrome/browser/ui/views/status_icons/status_tray_linux.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/ui/views/status_icons/status_tray_linux.h"
 
-#ifndef OS_CHROMEOS
+#if !defined(OS_CHROMEOS)
 #include "chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.h"
-#include "ui/linux_ui/linux_ui.h"
+#include "ui/views/linux_ui/linux_ui.h"
 
 StatusTrayLinux::StatusTrayLinux() {
 }
@@ -22,14 +22,14 @@ StatusIcon* StatusTrayLinux::CreatePlatformStatusIcon(
 }
 
 StatusTray* StatusTray::Create() {
-  const ui::LinuxUI* linux_ui = ui::LinuxUI::instance();
+  const views::LinuxUI* linux_ui = views::LinuxUI::instance();
 
   // Only create a status tray if we can actually create status icons.
   if (linux_ui && linux_ui->IsStatusIconSupported())
     return new StatusTrayLinux();
   return NULL;
 }
-#else
+#else  // defined(OS_CHROMEOS)
 StatusTray* StatusTray::Create() {
   return NULL;
 }