Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1189)

Unified Diff: chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

Issue 10412009: Enable disabled omnibox tests on aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/omnibox/omnibox_view_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index 9ef082d314df309ab76891599fab708c142c0785..b246942788397ef7a2ce2b04aaa02784c753e698 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -1392,11 +1392,8 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
CtrlKeyPressedWithInlineAutocompleteTest();
}
-#if defined(TOOLKIT_GTK)
-// TODO(oshima): enable these tests for views-implmentation when
-// these featuers are supported. http://crbug.com/121558.
-
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest, UndoRedoLinux) {
+#if defined(TOOLKIT_GTK) || defined(USE_AURA)
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, UndoRedo) {
ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL));
browser()->FocusLocationBar();
@@ -1461,6 +1458,25 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, UndoRedoLinux) {
EXPECT_TRUE(omnibox_view->GetText().empty());
}
+// See http://crosbug.com/10306
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
+ BackspaceDeleteHalfWidthKatakana) {
+ OmniboxView* omnibox_view = NULL;
+ ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
+ // Insert text: ダ
+ omnibox_view->SetUserText(UTF8ToUTF16("\357\276\200\357\276\236"));
+
+ // Move the cursor to the end.
+ ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_END, 0));
+
+ // Backspace should delete one character.
+ ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, 0));
+ EXPECT_EQ(UTF8ToUTF16("\357\276\200"), omnibox_view->GetText());
+}
+
+#endif // defined(TOOLKIT_GTK) || defined(USE_AURA)
+
+#if defined(TOOLKIT_GTK)
// See http://crbug.com/63860
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, PrimarySelection) {
OmniboxView* omnibox_view = NULL;
@@ -1486,22 +1502,6 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, PrimarySelection) {
EXPECT_EQ("Hello world", GetPrimarySelectionText());
}
-// See http://crosbug.com/10306
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
- BackspaceDeleteHalfWidthKatakana) {
- OmniboxView* omnibox_view = NULL;
- ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
- // Insert text: ダ
- omnibox_view->SetUserText(UTF8ToUTF16("\357\276\200\357\276\236"));
-
- // Move the cursor to the end.
- ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_END, 0));
-
- // Backspace should delete one character.
- ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, 0));
- EXPECT_EQ(UTF8ToUTF16("\357\276\200"), omnibox_view->GetText());
-}
-
// http://crbug.com/12316
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, PasteReplacingAll) {
OmniboxView* omnibox_view = NULL;
« no previous file with comments | « no previous file | chrome/browser/ui/views/omnibox/omnibox_view_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698