Fix RenderTextWin base dir and adjacent char code; remove test exceptions; etc.

ui/views/controls/textfield/native_textfield_views_unittest.cc

 // 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.
 
 #include <string>
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 1389 matching lines @@
 
   SendKeyEvent(0x05E2);
   EXPECT_EQ(WideToUTF16(L"\x05E1\x05E2"), textfield_->text());
   x = GetCursorBounds().x();
   EXPECT_GT(prev_x, x);
   prev_x = x;
 
   SendKeyEvent('a');
   EXPECT_EQ(WideToUTF16(L"\x05E1\x5E2"L"a"), textfield_->text());
   x = GetCursorBounds().x();
-#if defined(OS_WIN)
-  // In Windows, the text is always in LTR directionality even in RTL UI.
-  // TODO(xji): it should change if we fix the directionality in Window's
-  // NativeTextfieldViews
-  EXPECT_LT(prev_x, x);
-#else
   EXPECT_EQ(prev_x, x);
-#endif
   prev_x = x;
 
   SendKeyEvent('b');
   EXPECT_EQ(WideToUTF16(L"\x05E1\x5E2"L"ab"), textfield_->text());
   x = GetCursorBounds().x();
   EXPECT_EQ(prev_x, x);
 
   // Reset locale.
   base::i18n::SetICUDefaultLocale(locale);
 }
@@ skipping 69 matching lines @@
   MouseClick(bound, 10);
   EXPECT_EQ(bound, GetCursorBounds());
 
   NonClientMouseClick();
 
   // RTL-LTR string in LTR context.
   textfield_->SetText(WideToUTF16(L"\x05E1\x5E2"L"ab"));
 
   SendKeyEvent(ui::VKEY_HOME);
   bound = GetCursorBounds();
-#if defined(OS_WIN)
-  MouseClick(bound, -10);
-#else
   MouseClick(bound, 10);
-#endif
   EXPECT_EQ(bound, GetCursorBounds());
 
   SendKeyEvent(ui::VKEY_END);
   bound = GetCursorBounds();
-#if defined(OS_WIN)
-  MouseClick(bound, 10);
-#else
   MouseClick(bound, -10);
-#endif
   EXPECT_EQ(bound, GetCursorBounds());
 }
 
 TEST_F(NativeTextfieldViewsTest, HitOutsideTextAreaInRTLTest) {
   std::string locale = l10n_util::GetApplicationLocale("");
   base::i18n::SetICUDefaultLocale("he");
 
   InitTextfield(Textfield::STYLE_DEFAULT);
 
   // RTL-LTR string in RTL context.
   textfield_->SetText(WideToUTF16(L"\x05E1\x5E2"L"ab"));
   SendKeyEvent(ui::VKEY_HOME);
   gfx::Rect bound = GetCursorBounds();
   MouseClick(bound, 10);
   EXPECT_EQ(bound, GetCursorBounds());
 
   SendKeyEvent(ui::VKEY_END);
   bound = GetCursorBounds();
   MouseClick(bound, -10);
   EXPECT_EQ(bound, GetCursorBounds());
 
   NonClientMouseClick();
 
   // LTR-RTL string in RTL context.
   textfield_->SetText(WideToUTF16(L"ab\x05E1\x5E2"));
   SendKeyEvent(ui::VKEY_HOME);
   bound = GetCursorBounds();
-#if defined(OS_WIN)
-  MouseClick(bound, 10);
-#else
   MouseClick(bound, -10);
-#endif
   EXPECT_EQ(bound, GetCursorBounds());
 
   SendKeyEvent(ui::VKEY_END);
   bound = GetCursorBounds();
-#if defined(OS_WIN)
-  MouseClick(bound, -10);
-#else
   MouseClick(bound, 10);
-#endif
   EXPECT_EQ(bound, GetCursorBounds());
 
   // Reset locale.
   base::i18n::SetICUDefaultLocale(locale);
 }
 
 // This verifies that |bound| is contained by |display|. |bound|'s right edge
 // must be less than |diaplay|'s right edge.
 void OverflowCursorBoundTestVerifier(const gfx::Rect& display,
                                      const gfx::Rect& bound) {
@@ skipping 63 matching lines @@
 
 
 #if !defined(OS_WIN)
   // TODO(jennyz): NonClientMouseClick() does not work for os_win builds;
   // see crbug.com/104150. The mouse click in the next test will be confused
   // as a double click, which breaks the test. Disable the test until the
   // issue is fixed.
   NonClientMouseClick();
 
   MouseClick(bound, 1);
-#if defined(OS_WIN)
-  // In Windows, the text is always in LTR directionality even in RTL UI.
-  // TODO(xji): it should change if we fix the directionality in Window's
-  // NativeTextfieldViews
-  EXPECT_EQ(0U, textfield_->GetCursorPosition());
-#else
   EXPECT_EQ(500U, textfield_->GetCursorPosition());
-#endif
 #endif  // !defined(OS_WIN)
 
   // Reset locale.
   base::i18n::SetICUDefaultLocale(locale);
 }
 
 TEST_F(NativeTextfieldViewsTest, GetCompositionCharacterBoundsTest) {
   InitTextfield(Textfield::STYLE_DEFAULT);
 
   string16 str;
@@ skipping 28 matching lines @@
     EXPECT_EQ(char_rect[i], actual_rect) << " i=" << i;
   }
 
   // Return false if the index is out of range.
   EXPECT_FALSE(client->GetCompositionCharacterBounds(char_count, &rect));
   EXPECT_FALSE(client->GetCompositionCharacterBounds(char_count + 1, &rect));
   EXPECT_FALSE(client->GetCompositionCharacterBounds(char_count + 100, &rect));
 }
 
 }  // namespace views