Revert 184352

chrome/browser/ui/omnibox/omnibox_view_browsertest.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 <stdio.h>
 
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 761 matching lines @@
 
     // Revert to keyword hint mode.
     omnibox_view->model()->ClearKeyword(string16());
     ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
     ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
     ASSERT_EQ(search_keyword, omnibox_view->GetText());
 
     // Keyword should also be accepted by typing an ideographic space.
     omnibox_view->OnBeforePossibleChange();
     omnibox_view->SetWindowTextAndCaretPos(search_keyword +
-        base::WideToUTF16(L"\x3000"), search_keyword.length() + 1, false,
-        false);
+        WideToUTF16(L"\x3000"), search_keyword.length() + 1, false, false);
     omnibox_view->OnAfterPossibleChange();
     ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
     ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
     ASSERT_TRUE(omnibox_view->GetText().empty());
 
     // Revert to keyword hint mode.
     omnibox_view->model()->ClearKeyword(string16());
     ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
     ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
     ASSERT_EQ(search_keyword, omnibox_view->GetText());
@@ skipping 935 matching lines @@
 
   // These platforms should read bookmark format.
 #if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MACOSX)
   string16 title;
   std::string url;
   clipboard->ReadBookmark(&title, &url);
   EXPECT_EQ(target_url, url);
   EXPECT_EQ(ASCIIToUTF16(target_url), title);
 #endif
 }