Passing BackgroundColorSpan and UnderlineSpan from Clank to Blink.

content/browser/renderer_host/render_widget_host_view_aura_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 "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/memory/shared_memory.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 742 matching lines @@
 // Checks that IME-composition-event state is maintained correctly.
 TEST_F(RenderWidgetHostViewAuraTest, SetCompositionText) {
   view_->InitAsChild(NULL);
   view_->Show();
 
   ui::CompositionText composition_text;
   composition_text.text = base::ASCIIToUTF16("|a|b");
 
   // Focused segment
   composition_text.underlines.push_back(
-      ui::CompositionUnderline(0, 3, 0xff000000, true));
+      ui::CompositionUnderline(0, 3, 0xff000000, true, 0x78563412));
 
-  // Non-focused segment
+  // Non-focused segment, with different background color.
   composition_text.underlines.push_back(
-      ui::CompositionUnderline(3, 4, 0xff000000, false));
+      ui::CompositionUnderline(3, 4, 0xff000000, false, 0xefcdab90));
 
   const ui::CompositionUnderlines& underlines = composition_text.underlines;
 
   // Caret is at the end. (This emulates Japanese MSIME 2007 and later)
   composition_text.selection = gfx::Range(4);
 
   sink_->ClearMessages();
   view_->SetCompositionText(composition_text);
   EXPECT_TRUE(view_->has_composition_text_);
   {
     const IPC::Message* msg =
       sink_->GetFirstMessageMatching(ViewMsg_ImeSetComposition::ID);
     ASSERT_TRUE(msg != NULL);
 
     ViewMsg_ImeSetComposition::Param params;
     ViewMsg_ImeSetComposition::Read(msg, &params);
     // composition text
     EXPECT_EQ(composition_text.text, params.a);
     // underlines
     ASSERT_EQ(underlines.size(), params.b.size());
     for (size_t i = 0; i < underlines.size(); ++i) {
       EXPECT_EQ(underlines[i].start_offset, params.b[i].startOffset);
       EXPECT_EQ(underlines[i].end_offset, params.b[i].endOffset);
       EXPECT_EQ(underlines[i].color, params.b[i].color);
       EXPECT_EQ(underlines[i].thick, params.b[i].thick);
+      EXPECT_EQ(underlines[i].background_color, params.b[i].backgroundColor);
     }
     // highlighted range
     EXPECT_EQ(4, params.c) << "Should be the same to the caret pos";
     EXPECT_EQ(4, params.d) << "Should be the same to the caret pos";
   }
 
   view_->ImeCancelComposition();
   EXPECT_FALSE(view_->has_composition_text_);
 }
 
@@ skipping 1860 matching lines @@
   EXPECT_EQ(OVERSCROLL_NONE, overscroll_delegate()->completed_mode());
 
   SimulateGestureEvent(WebInputEvent::GestureScrollEnd,
                        blink::WebGestureDeviceTouchscreen);
   EXPECT_EQ(OVERSCROLL_NONE, overscroll_delegate()->current_mode());
   EXPECT_EQ(OVERSCROLL_EAST, overscroll_delegate()->completed_mode());
   EXPECT_EQ(3U, sink_->message_count());
 }
 
 }  // namespace content