MacViews: Fix setMarkedText in BridgedContentView to take replacementRange into account.

ui/views/cocoa/bridged_native_widget_unittest.mm

 // Copyright 2014 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.
 
 #import "ui/views/cocoa/bridged_native_widget.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include <memory>
 
@@ skipping 845 matching lines @@
 
   EXPECT_EQ_3(NO, [dummy_text_view_ hasMarkedText], [ns_view_ hasMarkedText]);
   EXPECT_FALSE(
       NSEqualRanges([dummy_text_view_ markedRange], [ns_view_ markedRange]));
   EXPECT_EQ_RANGE(EmptyRange(), [ns_view_ markedRange]);
   EXPECT_NSEQ_3(@"foo bar", GetExpectedText(), GetActualText());
   EXPECT_EQ_RANGE_3(NSMakeRange([GetActualText() length], 0),
                     GetExpectedSelectionRange(), GetActualSelectionRange());
 }
 
+// Test IME composition for accented characters.
+TEST_F(BridgedNativeWidgetTest, TextInput_AccentedCharacter) {
+  InstallTextField("abc");
+
+  // Simulate action messages generated when the key 'a' is pressed repeatedly
+  // and leads to the showing of an IME candidate window.
+
+  // First an insertText: message with key 'a' is generated.
+  [ns_view_ insertText:@"a" replacementRange:EmptyRange()];
+  [dummy_text_view_ insertText:@"a" replacementRange:EmptyRange()];
+  EXPECT_EQ_3(NO, [dummy_text_view_ hasMarkedText], [ns_view_ hasMarkedText]);
+  EXPECT_NSEQ_3(@"abca", GetExpectedText(), GetActualText());
+
+  // Next the IME popup appears. On selecting the accented character using arrow
+  // keys, setMarkedText action message is generated which replaces the earlier
+  // inserted 'a'.
+  [ns_view_ setMarkedText:@"à"
+            selectedRange:NSMakeRange(0, 1)
+         replacementRange:NSMakeRange(3, 1)];
+  [dummy_text_view_ setMarkedText:@"à"
+                    selectedRange:NSMakeRange(0, 1)
+                 replacementRange:NSMakeRange(3, 1)];
+  EXPECT_EQ_3(YES, [dummy_text_view_ hasMarkedText], [ns_view_ hasMarkedText]);
+  EXPECT_EQ_RANGE_3(NSMakeRange(3, 1), [dummy_text_view_ markedRange],
+                    [ns_view_ markedRange]);
+  EXPECT_EQ_RANGE_3(NSMakeRange(3, 1), GetExpectedSelectionRange(),
+                    GetActualSelectionRange());
+  EXPECT_NSEQ_3(@"abcà", GetExpectedText(), GetActualText());
+}
+
 // Test moving the caret left and right using text input protocol.
 TEST_F(BridgedNativeWidgetTest, TextInput_MoveLeftRight) {
   InstallTextField("foo");
   EXPECT_EQ_RANGE_3(NSMakeRange(3, 0), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
 
   // Move right not allowed, out of range.
   PerformCommand(@selector(moveRight:));
   EXPECT_EQ_RANGE_3(NSMakeRange(3, 0), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
@@ skipping 320 matching lines @@
   [center postNotificationName:NSWindowDidExitFullScreenNotification
                         object:window];
   EXPECT_EQ(1, [window ignoredToggleFullScreenCount]);  // No change.
   EXPECT_FALSE(bridge()->target_fullscreen_state());
 
   widget_->CloseNow();
 }
 
 }  // namespace test
 }  // namespace views