Move the test functions that deal with focus to interactive_ui_tets_utils.h and into the interactiv…

chrome/test/base/ui_test_utils.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_TEST_BASE_UI_TEST_UTILS_H_
 #define CHROME_TEST_BASE_UI_TEST_UTILS_H_
 
 #include <map>
 #include <queue>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "chrome/browser/history/history.h"
-#include "chrome/browser/ui/view_ids.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/test/test_utils.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/native_widget_types.h"
-#include "ui/ui_controls/ui_controls.h"
 #include "webkit/glue/window_open_disposition.h"
 
-#if defined(TOOLKIT_VIEWS)
-#include "ui/views/view.h"
-#endif
-
 class AppModalDialog;
 class BookmarkModel;
 class Browser;
 class FilePath;
 class LocationBar;
 class Profile;
 class SkBitmap;
 class TemplateURLService;
 
 namespace chrome {
 struct NavigateParams;
 }
 
 namespace content {
 class MessageLoopRunner;
 class RenderViewHost;
 class RenderWidgetHost;
 class WebContents;
 }
 
 namespace gfx {
-class Point;
 class Rect;
 class Size;
 }
 
 // A collections of functions designed for use with InProcessBrowserTest.
 namespace ui_test_utils {
 
 // Flags to indicate what to wait for in a navigation test.
 // They can be ORed together.
 // The order in which the waits happen when more than one is selected, is:
@@ skipping 70 matching lines @@
 // matches found.  |ordinal| is an optional parameter which is set to the index
 // of the current match. |selection_rect| is an optional parameter which is set
 // to the location of the current match.
 int FindInPage(content::WebContents* tab,
                const string16& search_string,
                bool forward,
                bool case_sensitive,
                int* ordinal,
                gfx::Rect* selection_rect);
 
-// Returns true if the View is focused.
-bool IsViewFocused(const Browser* browser, ViewID vid);
-
-// Simulates a mouse click on a View in the browser.
-void ClickOnView(const Browser* browser, ViewID vid);
-
 // Register |observer| for the given |type| and |source| and run
 // the message loop until the observer posts a quit task.
 void RegisterAndWait(content::NotificationObserver* observer,
                      int type,
                      const content::NotificationSource& source);
 
 // Blocks until |model| finishes loading.
 void WaitForBookmarkModelToLoad(BookmarkModel* model);
 
 // Blocks until |service| finishes loading.
 void WaitForTemplateURLServiceToLoad(TemplateURLService* service);
 
 // Blocks until the |history_service|'s history finishes loading.
 void WaitForHistoryToLoad(HistoryService* history_service);
 
 // Download the given file and waits for the download to complete.
 void DownloadURL(Browser* browser, const GURL& download_url);
 
 // Send the given text to the omnibox and wait until it's updated.
 void SendToOmniboxAndSubmit(LocationBar* location_bar,
                             const std::string& input);
 
-// Brings the native window for |browser| to the foreground. Returns true on
-// success.
-bool BringBrowserWindowToFront(const Browser* browser) WARN_UNUSED_RESULT;
-
 // Gets the first browser that is not in the specified set.
 Browser* GetBrowserNotInSet(std::set<Browser*> excluded_browsers);
 
-// Sends a key press, blocking until the key press is received or the test times
-// out. This uses ui_controls::SendKeyPress, see it for details. Returns true
-// if the event was successfully sent and received.
-bool SendKeyPressSync(const Browser* browser,
-                      ui::KeyboardCode key,
-                      bool control,
-                      bool shift,
-                      bool alt,
-                      bool command) WARN_UNUSED_RESULT;
-
-// Sends a key press, blocking until both the key press and a notification from
-// |source| of type |type| are received, or until the test times out. This uses
-// ui_controls::SendKeyPress, see it for details. Returns true if the event was
-// successfully sent and both the event and notification were received.
-bool SendKeyPressAndWait(const Browser* browser,
-                         ui::KeyboardCode key,
-                         bool control,
-                         bool shift,
-                         bool alt,
-                         bool command,
-                         int type,
-                         const content::NotificationSource& source)
-                             WARN_UNUSED_RESULT;
-
-// Sends a move event blocking until received. Returns true if the event was
-// successfully received. This uses ui_controls::SendMouse***NotifyWhenDone,
-// see it for details.
-bool SendMouseMoveSync(const gfx::Point& location) WARN_UNUSED_RESULT;
-bool SendMouseEventsSync(ui_controls::MouseButton type,
-                         int state) WARN_UNUSED_RESULT;
-
 // A WindowedNotificationObserver hard-wired to observe
 // chrome::NOTIFICATION_TAB_ADDED.
 class WindowedTabAddedNotificationObserver
     : public content::WindowedNotificationObserver {
  public:
   // Register to listen for notifications of NOTIFICATION_TAB_ADDED from either
   // a specific source, or from all sources if |source| is
   // NotificationService::AllSources().
   explicit WindowedTabAddedNotificationObserver(
       const content::NotificationSource& source);
@@ skipping 81 matching lines @@
   // Wait for a new browser to be created, and return a pointer to it.
   Browser* WaitForSingleNewBrowser();
 
  private:
   content::WindowedNotificationObserver notification_observer_;
   std::set<Browser*> original_browsers_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAddedObserver);
 };
 
-// See SendKeyPressAndWait.  This function additionally performs a check on the
-// NotificationDetails using the provided Details<U>.
-template <class U>
-bool SendKeyPressAndWaitWithDetails(
-    const Browser* browser,
-    ui::KeyboardCode key,
-    bool control,
-    bool shift,
-    bool alt,
-    bool command,
-    int type,
-    const content::NotificationSource& source,
-    const content::Details<U>& details) WARN_UNUSED_RESULT;
-
-template <class U>
-bool SendKeyPressAndWaitWithDetails(
-    const Browser* browser,
-    ui::KeyboardCode key,
-    bool control,
-    bool shift,
-    bool alt,
-    bool command,
-    int type,
-    const content::NotificationSource& source,
-    const content::Details<U>& details) {
-  WindowedNotificationObserverWithDetails<U> observer(type, source);
-
-  if (!SendKeyPressSync(browser, key, control, shift, alt, command))
-    return false;
-
-  observer.Wait();
-
-  U my_details;
-  if (!observer.GetDetailsFor(source.map_key(), &my_details))
-    return false;
-
-  return *details.ptr() == my_details && !testing::Test::HasFatalFailure();
-}
-
-// Hide a native window.
-void HideNativeWindow(gfx::NativeWindow window);
-
-// Show and focus a native window. Returns true on success.
-bool ShowAndFocusNativeWindow(gfx::NativeWindow window) WARN_UNUSED_RESULT;
-
 // Takes a snapshot of the given render widget, rendered at |page_size|. The
 // snapshot is set to |bitmap|. Returns true on success.
 bool TakeRenderWidgetSnapshot(content::RenderWidgetHost* rwh,
                               const gfx::Size& page_size,
                               SkBitmap* bitmap) WARN_UNUSED_RESULT;
 
 // Takes a snapshot of the entire page, according to the width and height
 // properties of the DOM's document. Returns true on success. DOMAutomation
 // must be enabled.
 bool TakeEntirePageSnapshot(content::RenderViewHost* rvh,
                             SkBitmap* bitmap) WARN_UNUSED_RESULT;
 
-// A combination of SendMouseMove to the middle of the view followed by
-// SendMouseEvents.
-void MoveMouseToCenterAndPress(
-#if defined(TOOLKIT_VIEWS)
-    views::View* view,
-#elif defined(TOOLKIT_GTK)
-    GtkWidget* widget,
-#elif defined(OS_IOS)
-    UIView* view,
-#elif defined(OS_MACOSX)
-    NSView* view,
-#endif
-    ui_controls::MouseButton button,
-    int state,
-    const base::Closure& task);
-
 #if defined(OS_WIN)
 // Saves a snapshot of the entire screen to a file named
 // ChromiumSnapshotYYYYMMDDHHMMSS.png to |directory|, returning true on success.
 // The path to the file produced is returned in |screenshot_path| if non-NULL.
 bool SaveScreenSnapshotToDirectory(const FilePath& directory,
                                    FilePath* screenshot_path);
 
 // Saves a snapshot of the entire screen as above to the current user's desktop.
 // The Chrome path provider must be registered prior to calling this function.
 bool SaveScreenSnapshotToDesktop(FilePath* screenshot_path);
 #endif
 
 // Configures the geolocation provider to always return the given position.
 void OverrideGeolocation(double latitude, double longitude);
 
-namespace internal {
-
-// A utility function to send a mouse click event in a closure. It's shared by
-// ui_controls_linux.cc and ui_controls_mac.cc
-void ClickTask(ui_controls::MouseButton button,
-               int state,
-               const base::Closure& followup);
-
-}  // namespace internal
-
 // Enumerates all history contents on the backend thread. Returns them in
 // descending order by time.
 class HistoryEnumerator {
  public:
   explicit HistoryEnumerator(Profile* profile);
   ~HistoryEnumerator();
 
   std::vector<GURL>& urls() { return urls_; }
 
  private:
   void HistoryQueryComplete(
       const base::Closure& quit_task,
       HistoryService::Handle request_handle,
       history::QueryResults* results);
 
   std::vector<GURL> urls_;
 
   CancelableRequestConsumer consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryEnumerator);
 };
 
 }  // namespace ui_test_utils
 
 #endif  // CHROME_TEST_BASE_UI_TEST_UTILS_H_