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

ui/gfx/canvas_skia.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 "ui/gfx/canvas.h"
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/range/range.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/render_text.h"
 #include "ui/gfx/shadow_value.h"
 #include "ui/gfx/skia_util.h"
 
 namespace {
 
 // If necessary, wraps |text| with RTL/LTR directionality characters based on
 // |flags| and |text| content.
 // Returns true if the text will be rendered right-to-left.
-// TODO(asvitkine): Support setting directionality directly on RenderText, so
-//                  that wrapping the text is not needed.
+// TODO(msw): Nix this, now that RenderTextWin supports directionality directly.
 bool AdjustStringDirection(int flags, string16* text) {
+  // TODO(msw): FORCE_LTR_DIRECTIONALITY does not work for RTL text now.
+
   // If the string is empty or LTR was forced, simply return false since the
   // default RenderText directionality is already LTR.
   if (text->empty() || (flags & gfx::Canvas::FORCE_LTR_DIRECTIONALITY))
     return false;
 
   // If RTL is forced, apply it to the string.
   if (flags & gfx::Canvas::FORCE_RTL_DIRECTIONALITY) {
     base::i18n::WrapStringWithRTLFormatting(text);
     return true;
   }
@@ skipping 430 matching lines @@
   rect.set_height(line_height);
   render_text->SetDisplayRect(rect);
 
   canvas_->save(SkCanvas::kClip_SaveFlag);
   ClipRect(display_rect);
   render_text->Draw(this);
   canvas_->restore();
 }
 
 }  // namespace gfx