diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-25 19:40:10 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-12-03 13:52:53 +0000 |
| commit | 4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7 (patch) | |
| tree | 938665d93a11fe7a6d0124e3c1e020d1f9d3f947 /chrome/browser/gtk/bookmark_bar_gtk_interactive_uitest.cc | |
| parent | 7c627d87728a355737862918d144f98f69406954 (diff) | |
| download | external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.zip external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.gz external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.bz2 | |
Merge Chromium at r66597: Initial merge by git.
Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
Diffstat (limited to 'chrome/browser/gtk/bookmark_bar_gtk_interactive_uitest.cc')
| -rw-r--r-- | chrome/browser/gtk/bookmark_bar_gtk_interactive_uitest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/gtk/bookmark_bar_gtk_interactive_uitest.cc b/chrome/browser/gtk/bookmark_bar_gtk_interactive_uitest.cc index 0fc9101..cb027a8 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk_interactive_uitest.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk_interactive_uitest.cc @@ -4,10 +4,10 @@ #include <gtk/gtk.h> -#include "chrome/browser/browser.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/gtk/view_id_util.h" #include "chrome/browser/tabs/tab_strip_model.h" +#include "chrome/browser/ui/browser.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" #include "net/test/test_server.h" @@ -22,12 +22,12 @@ void OnClicked(GtkWidget* widget, bool* clicked_bit) { } // namespace -class BookmarkBarGtkBrowserTest : public InProcessBrowserTest { +class BookmarkBarGtkInteractiveUITest : public InProcessBrowserTest { }; // Makes sure that when you switch back to an NTP with an active findbar, // the findbar is above the floating bookmark bar. -IN_PROC_BROWSER_TEST_F(BookmarkBarGtkBrowserTest, FindBarTest) { +IN_PROC_BROWSER_TEST_F(BookmarkBarGtkInteractiveUITest, FindBarTest) { ASSERT_TRUE(test_server()->Start()); // Create new tab; open findbar. @@ -52,7 +52,7 @@ IN_PROC_BROWSER_TEST_F(BookmarkBarGtkBrowserTest, FindBarTest) { } // Makes sure that you can click on the floating bookmark bar. -IN_PROC_BROWSER_TEST_F(BookmarkBarGtkBrowserTest, ClickOnFloatingTest) { +IN_PROC_BROWSER_TEST_F(BookmarkBarGtkInteractiveUITest, ClickOnFloatingTest) { ASSERT_TRUE(test_server()->Start()); GtkWidget* other_bookmarks = |