Remove url_replacement logic from Omnibox/ToolbarModel

chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

Index: chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index 35b02b472a03a30e5663121e1612a8c19225c164..fa0c0653dad015984ffcc1b975883cd77d380d6d 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -1850,67 +1850,6 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, CtrlArrowAfterArrowSuggestions) {
   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|.