Makes chrome pass down the length of text as the end of the

chrome/browser/instant/instant_browsertest.cc

 // Copyright (c) 2010 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 "base/command_line.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
@@ skipping 87 matching lines @@
   void SetupPreview() {
     // Wait for the preview to navigate.
     WaitForPreviewToNavigate(true);
 
     ASSERT_TRUE(browser()->instant()->IsShowingInstant());
     ASSERT_FALSE(browser()->instant()->is_displayable());
     ASSERT_TRUE(browser()->instant()->is_active());
 
     // When the page loads, the initial searchBox values are set and only a
     // resize will have been sent.
-    ASSERT_EQ("true 0 0 0 1 a false a false",
-        GetSearchStateAsString(preview_));
+    ASSERT_EQ("true 0 0 0 1 a false a false 1 1",
+              GetSearchStateAsString(preview_));
   }
 
   void SetLocationBarText(const std::wstring& text) {
     ASSERT_NO_FATAL_FAILURE(FindLocationBar());
     location_bar_->location_entry()->SetUserText(text);
     ui_test_utils::WaitForNotification(
         NotificationType::INSTANT_CONTROLLER_SHOWN);
   }
 
   const string16& GetSuggestion() const {
@@ skipping 50 matching lines @@
   // following:
   // window.chrome.sv
   // window.onsubmitcalls
   // window.oncancelcalls
   // window.onchangecalls
   // window.onresizecalls
   // window.beforeLoadSearchBox.value
   // window.beforeLoadSearchBox.verbatim
   // window.chrome.searchBox.value
   // window.chrome.searchBox.verbatim
+  // window.chrome.searchBox.selectionStart
+  // window.chrome.searchBox.selectionEnd
   // If determining any of the values fails, the value is 'fail'.
   std::string GetSearchStateAsString(TabContents* tab_contents) {
     bool sv = false;
     int onsubmitcalls = 0;
     int oncancelcalls = 0;
     int onchangecalls = 0;
     int onresizecalls = 0;
+    int selection_start = 0;
+    int selection_end = 0;
     std::string before_load_value;
     bool before_load_verbatim = false;
     std::string value;
     bool verbatim = false;
 
     if (!GetBoolFromJavascript(tab_contents, "window.chrome.sv", &sv) ||
         !GetIntFromJavascript(tab_contents, "window.onsubmitcalls",
                               &onsubmitcalls) ||
         !GetIntFromJavascript(tab_contents, "window.oncancelcalls",
                               &oncancelcalls) ||
         !GetIntFromJavascript(tab_contents, "window.onchangecalls",
                               &onchangecalls) ||
         !GetIntFromJavascript(tab_contents, "window.onresizecalls",
                               &onresizecalls) ||
         !GetStringFromJavascript(
             tab_contents, "window.beforeLoadSearchBox.value",
             &before_load_value) ||
         !GetBoolFromJavascript(
             tab_contents, "window.beforeLoadSearchBox.verbatim",
             &before_load_verbatim) ||
         !GetStringFromJavascript(tab_contents, "window.chrome.searchBox.value",
                                  &value) ||
         !GetBoolFromJavascript(tab_contents, "window.chrome.searchBox.verbatim",
-                               &verbatim)) {
+                               &verbatim) ||
+        !GetIntFromJavascript(tab_contents,
+                              "window.chrome.searchBox.selectionStart",
+                              &selection_start) ||
+        !GetIntFromJavascript(tab_contents,
+                              "window.chrome.searchBox.selectionEnd",
+                              &selection_end)) {
       return "fail";
     }
 
-    return StringPrintf("%s %d %d %d %d %s %s %s %s",
+    return StringPrintf("%s %d %d %d %d %s %s %s %s %d %d",
                         sv ? "true" : "false",
                         onsubmitcalls,
                         oncancelcalls,
                         onchangecalls,
                         onresizecalls,
                         before_load_value.c_str(),
                         before_load_verbatim ? "true" : "false",
                         value.c_str(),
-                        verbatim ? "true" : "false");
+                        verbatim ? "true" : "false",
+                        selection_start,
+                        selection_end);
   }
 
   void CheckStringValueFromJavascript(
       const std::string& expected,
       const std::string& function,
       TabContents* tab_contents) {
     std::string result;
     ASSERT_TRUE(GetStringFromJavascript(tab_contents, function, &result));
     ASSERT_EQ(expected, result);
   }
@@ skipping 40 matching lines @@
 // Verify that the onchange event is dispatched upon typing in the box.
 IN_PROC_BROWSER_TEST_F(InstantTest, OnChangeEvent) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   ASSERT_NO_FATAL_FAILURE(SetupPreview());
 
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(L"abc"));
 
   // Check that the value is reflected and onchange is called.
-  EXPECT_EQ("true 0 0 1 1 a false abc false",
+  EXPECT_EQ("true 0 0 1 1 a false abc false 3 3",
       GetSearchStateAsString(preview_));
 }
 
 IN_PROC_BROWSER_TEST_F(InstantTest, SetSuggestionsArrayOfStrings) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   ASSERT_NO_FATAL_FAILURE(SetupPreview());
 
   SetSuggestionsJavascriptArgument(preview_, "['abcde', 'unused']");
@@ skipping 287 matching lines @@
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(L"abc"));
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RETURN));
 
   // Check that the preview contents have been committed.
   ASSERT_FALSE(browser()->instant()->GetPreviewContents());
   ASSERT_FALSE(browser()->instant()->is_active());
   TabContents* contents = browser()->GetSelectedTabContents();
   ASSERT_TRUE(contents);
 
   // Check that the value is reflected and onsubmit is called.
-  EXPECT_EQ("true 1 0 1 1 a false abc true",
+  EXPECT_EQ("true 1 0 1 1 a false abc true 3 3",
       GetSearchStateAsString(preview_));
 }
 
 // Verify that the oncancel event is dispatched upon losing focus.
 IN_PROC_BROWSER_TEST_F(InstantTest, OnCancelEvent) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
 
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   ASSERT_NO_FATAL_FAILURE(SetupPreview());
 
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(L"abc"));
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::ClickOnView(browser(),
                                                      VIEW_ID_TAB_CONTAINER));
 
   // Check that the preview contents have been committed.
   ASSERT_FALSE(browser()->instant()->GetPreviewContents());
   ASSERT_FALSE(browser()->instant()->is_active());
   TabContents* contents = browser()->GetSelectedTabContents();
   ASSERT_TRUE(contents);
 
   // Check that the value is reflected and oncancel is called.
-  EXPECT_EQ("true 0 1 1 1 a false abc false",
+  EXPECT_EQ("true 0 1 1 1 a false abc false 3 3",
       GetSearchStateAsString(preview_));
 }
 
 #if !defined(OS_MACOSX)
 // Only passes on Mac.  http://crbug.com/66850
 #define MAYBE_TabKey FAILS_TabKey
 #else
 #define MAYBE_TabKey TabKey
 #endif
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_TabKey) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
 
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   ASSERT_NO_FATAL_FAILURE(SetupPreview());
 
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(L"abc"));
 
   // Pressing tab to convert instant suggest into inline autocomplete.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB));
 
   ASSERT_EQ(L"abcdef", location_bar_->location_entry()->GetText());
 
-  EXPECT_EQ("true 0 0 2 2 a false abcdef false",
+  EXPECT_EQ("true 0 0 2 2 a false abcdef false 6 6",
       GetSearchStateAsString(preview_));
 
   // Pressing tab again to accept the current instant preview.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB));
 
   // Check that the preview contents have been committed.
   ASSERT_FALSE(browser()->instant()->GetPreviewContents());
   ASSERT_FALSE(browser()->instant()->is_active());
   TabContents* contents = browser()->GetSelectedTabContents();
   ASSERT_TRUE(contents);
 
   // Check that the value is reflected and onsubmit is called.
-  EXPECT_EQ("true 1 0 2 2 a false abcdef true",
+  EXPECT_EQ("true 1 0 2 2 a false abcdef true 6 6",
       GetSearchStateAsString(preview_));
 }