Move a bunch of random other files to src/ui/base...

chrome/browser/chromeos/notifications/notification_browsertest.cc

 // Copyright (c) 2010 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 "app/x11_util.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/notifications/balloon_collection_impl.h"
 #include "chrome/browser/chromeos/notifications/balloon_view.h"
 #include "chrome/browser/chromeos/notifications/notification_panel.h"
 #include "chrome/browser/chromeos/notifications/system_notification_factory.h"
 #include "chrome/browser/notifications/notification_test_util.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
+#include "ui/base/x/x11_util.h"
 
 namespace {
 
 // The name of ChromeOS's window manager.
 const char* kChromeOsWindowManagerName = "chromeos-wm";
 
 }  // namespace
 
 namespace chromeos {
 
 class NotificationTest : public InProcessBrowserTest,
                          public NotificationObserver {
  public:
   NotificationTest()
       : under_chromeos_(false),
         state_(PanelController::INITIAL),
         expected_(PanelController::INITIAL) {
   }
 
   void HandleDOMUIMessage(const ListValue* value) {
     MessageLoop::current()->Quit();
   }
 
  protected:
   virtual void SetUp() {
     // Detect if we're running under ChromeOS WindowManager. See
     // the description for "under_chromeos_" below for why we need this.
     std::string wm_name;
-    bool wm_name_valid = x11_util::GetWindowManagerName(&wm_name);
+    bool wm_name_valid = ui::GetWindowManagerName(&wm_name);
     // NOTE: On Chrome OS the wm and Chrome are started in parallel. This
     // means it's possible for us not to be able to get the name of the window
     // manager. We assume that when this happens we're on Chrome OS.
     under_chromeos_ = (!wm_name_valid ||
                        wm_name == kChromeOsWindowManagerName);
     InProcessBrowserTest::SetUp();
   }
 
   BalloonCollectionImpl* GetBalloonCollectionImpl() {
     return static_cast<BalloonCollectionImpl*>(
@@ skipping 525 matching lines @@
   EXPECT_TRUE(collection->AddDOMUIMessageCallback(
       NewMockNotification("1"),
       "test",
       NewCallback(
           static_cast<NotificationTest*>(this),
           &NotificationTest::HandleDOMUIMessage)));
   MessageLoop::current()->Run();
 }
 
 }  // namespace chromeos