Remove url_replacement logic from Omnibox/ToolbarModel

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 <stddef.h>
 #include <stdio.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/scoped_observer.h"
@@ skipping 1832 matching lines @@
   // Mac uses alt-left/right to select a word.
   const int modifiers = ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN;
 #else
   const int modifiers = ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN;
 #endif
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, modifiers));
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, modifiers));
   ASSERT_EQ(ASCIIToUTF16("www.bar.com/2"), omnibox_view->GetText());
 }
 
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
-                       PersistSearchReplacementAcrossTabSwitch) {
-  EXPECT_TRUE(browser()->toolbar_model()->url_replacement_enabled());
-  browser()->toolbar_model()->set_url_replacement_enabled(false);
-
-  // Create a new tab.
-  chrome::NewTab(browser());
-  EXPECT_TRUE(browser()->toolbar_model()->url_replacement_enabled());
-
-  // Switch back to the first tab.
-  browser()->tab_strip_model()->ActivateTabAt(0, true);
-  EXPECT_FALSE(browser()->toolbar_model()->url_replacement_enabled());
-}
-
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
-                       DontUpdateURLWhileSearchTermReplacementIsDisabled) {
-  OmniboxView* omnibox_view = NULL;
-  ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
-  TestToolbarModel* test_toolbar_model = new TestToolbarModel;
-  std::unique_ptr<ToolbarModel> toolbar_model(test_toolbar_model);
-  browser()->swap_toolbar_models(&toolbar_model);
-
-  base::string16 url_a(ASCIIToUTF16("http://www.a.com/"));
-  base::string16 url_b(ASCIIToUTF16("http://www.b.com/"));
-  base::string16 url_c(ASCIIToUTF16("http://www.c.com/"));
-  chrome::FocusLocationBar(browser());
-  test_toolbar_model->set_text(url_a);
-  omnibox_view->Update();
-  EXPECT_EQ(url_a, omnibox_view->GetText());
-
-  // Disable URL replacement and update.  Because the omnibox has focus, the
-  // visible text shouldn't change; see comments in
-  // OmniboxEditModel::UpdatePermanentText().
-  browser()->toolbar_model()->set_url_replacement_enabled(false);
-  test_toolbar_model->set_text(url_b);
-  omnibox_view->Update();
-  EXPECT_EQ(url_a, omnibox_view->GetText());
-
-  // Re-enable URL replacement and ensure updating changes the text.
-  browser()->toolbar_model()->set_url_replacement_enabled(true);
-  // We have to change the toolbar model text here, or Update() will do nothing.
-  // This is because the previous update already updated the permanent text.
-  test_toolbar_model->set_text(url_c);
-  omnibox_view->Update();
-  EXPECT_EQ(url_c, omnibox_view->GetText());
-
-  // The same test, but using RevertAll() to reset search term replacement.
-  test_toolbar_model->set_text(url_a);
-  omnibox_view->Update();
-  EXPECT_EQ(url_a, omnibox_view->GetText());
-  browser()->toolbar_model()->set_url_replacement_enabled(false);
-  test_toolbar_model->set_text(url_b);
-  omnibox_view->Update();
-  EXPECT_EQ(url_a, omnibox_view->GetText());
-  omnibox_view->RevertAll();
-  EXPECT_EQ(url_b, omnibox_view->GetText());
-  test_toolbar_model->set_text(url_c);
-  omnibox_view->Update();
-  EXPECT_EQ(url_c, omnibox_view->GetText());
-}
-
 namespace {
 
 // Returns the number of characters currently selected in |omnibox_view|.
 size_t GetSelectionSize(OmniboxView* omnibox_view) {
   size_t start, end;
   omnibox_view->GetSelectionBounds(&start, &end);
   if (end >= start)
     return end - start;
   return start - end;
 }
@@ skipping 64 matching lines @@
 
   // Now Shift+Right should do nothing, and Shift+Left should reduce.
   // At the end, so Shift+Right should do nothing.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RIGHT, ui::EF_SHIFT_DOWN));
   EXPECT_EQ(2u, GetSelectionSize(omnibox_view));
 
   // And Left should reduce by one character.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, ui::EF_SHIFT_DOWN));
   EXPECT_EQ(1u, GetSelectionSize(omnibox_view));
 }