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

BUG=none
TEST=none
TBR=brettw

Review URL: http://codereview.chromium.org/6257006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71970 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc
index 251693c..f30ed16 100644
--- a/chrome/browser/unload_uitest.cc
+++ b/chrome/browser/unload_uitest.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/message_box_flags.h"
 #include "base/file_util.h"
 #include "base/test/test_timeouts.h"
 #include "chrome/browser/net/url_request_mock_http_job.h"
@@ -13,6 +12,7 @@
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/url_request/url_request_unittest.h"
+#include "ui/base/message_box_flags.h"
 #include "views/event.h"
 
 const std::string NOLISTENERS_HTML =
@@ -165,9 +165,9 @@ class UnloadTest : public UITest {
     EXPECT_TRUE(CloseBrowser(browser.get(), &application_closed));
   }
 
-  void ClickModalDialogButton(MessageBoxFlags::DialogButton button) {
+  void ClickModalDialogButton(ui::MessageBoxFlags::DialogButton button) {
     bool modal_dialog_showing = false;
-    MessageBoxFlags::DialogButton available_buttons;
+    ui::MessageBoxFlags::DialogButton available_buttons;
     EXPECT_TRUE(automation()->WaitForAppModalDialog());
     EXPECT_TRUE(automation()->GetShowingAppModalDialog(&modal_dialog_showing,
         &available_buttons));
@@ -300,7 +300,7 @@ TEST_F(UnloadTest, BrowserCloseBeforeUnloadOK) {
   NavigateToDataURL(BEFORE_UNLOAD_HTML, L"beforeunload");
 
   CloseBrowserAsync(browser.get());
-  ClickModalDialogButton(MessageBoxFlags::DIALOGBUTTON_OK);
+  ClickModalDialogButton(ui::MessageBoxFlags::DIALOGBUTTON_OK);
   WaitForBrowserClosed();
 }
 
@@ -312,14 +312,14 @@ TEST_F(UnloadTest, BrowserCloseBeforeUnloadCancel) {
   NavigateToDataURL(BEFORE_UNLOAD_HTML, L"beforeunload");
 
   CloseBrowserAsync(browser.get());
-  ClickModalDialogButton(MessageBoxFlags::DIALOGBUTTON_CANCEL);
+  ClickModalDialogButton(ui::MessageBoxFlags::DIALOGBUTTON_CANCEL);
   // There's no real graceful way to wait for something _not_ to happen, so
   // we just wait a short period.
   CrashAwareSleep(500);
   ASSERT_TRUE(IsBrowserRunning());
 
   CloseBrowserAsync(browser.get());
-  ClickModalDialogButton(MessageBoxFlags::DIALOGBUTTON_OK);
+  ClickModalDialogButton(ui::MessageBoxFlags::DIALOGBUTTON_OK);
   WaitForBrowserClosed();
 }
 
@@ -341,7 +341,7 @@ TEST_F(UnloadTest, MAYBE_BrowserCloseWithInnerFocusedFrame) {
   NavigateToDataURL(INNER_FRAME_WITH_FOCUS_HTML, L"innerframewithfocus");
 
   CloseBrowserAsync(browser.get());
-  ClickModalDialogButton(MessageBoxFlags::DIALOGBUTTON_OK);
+  ClickModalDialogButton(ui::MessageBoxFlags::DIALOGBUTTON_OK);
   WaitForBrowserClosed();
 }