Remove OriginChip code.

chrome/browser/ui/toolbar/toolbar_model_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 "chrome/browser/ui/toolbar/toolbar_model.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
@@ skipping 130 matching lines @@
   ToolbarModelTest();
   ToolbarModelTest(Browser::Type browser_type,
                    chrome::HostDesktopType host_desktop_type,
                    bool hosted_app);
   ~ToolbarModelTest() override;
 
   // BrowserWithTestWindowTest:
   void SetUp() override;
 
  protected:
-  void EnableOriginChipFieldTrial();
   void NavigateAndCheckText(const GURL& url,
                             const base::string16& expected_text,
                             bool would_perform_search_term_replacement,
                             bool should_display_url);
 
  private:
   scoped_ptr<base::FieldTrialList> field_trial_list_;
 
   DISALLOW_COPY_AND_ASSIGN(ToolbarModelTest);
 };
@@ skipping 15 matching lines @@
 
 void ToolbarModelTest::SetUp() {
   BrowserWithTestWindowTest::SetUp();
   TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
       profile(), &TemplateURLServiceFactory::BuildInstanceFor);
   AutocompleteClassifierFactory::GetInstance()->SetTestingFactoryAndUse(
       profile(), &AutocompleteClassifierFactory::BuildInstanceFor);
   UIThreadSearchTermsData::SetGoogleBaseURL("http://google.com/");
 }
 
-void ToolbarModelTest::EnableOriginChipFieldTrial() {
-  field_trial_list_.reset(new base::FieldTrialList(
-      new metrics::SHA1EntropyProvider("platypus")));
-  base::FieldTrialList::CreateFieldTrial("EmbeddedSearch",
-                                         "Group1 espv:2 origin_chip:1");
-}
-
 void ToolbarModelTest::NavigateAndCheckText(
     const GURL& url,
     const base::string16& expected_text,
     bool would_perform_search_term_replacement,
     bool should_display_url) {
   // Check while loading.
   content::NavigationController* controller =
       &browser()->tab_strip_model()->GetWebContentsAt(0)->GetController();
   controller->LoadURL(url, content::Referrer(), ui::PAGE_TRANSITION_LINK,
                       std::string());
@@ skipping 75 matching lines @@
   // Disabling URL replacement should reset to only showing URLs.
   browser()->toolbar_model()->set_url_replacement_enabled(false);
   for (size_t i = 0; i < arraysize(test_items); ++i) {
     const TestItem& test_item = test_items[i];
     NavigateAndCheckText(test_item.url,
                          test_item.expected_text_url_replacement_inactive,
                          false, test_item.should_display_url);
   }
 }
 
-// Test that we remove or replace URLs appropriately when the origin chip is
-// enabled.
-TEST_F(ToolbarModelTest, ShouldDisplayURL_OriginChip) {
-  EnableOriginChipFieldTrial();
-  AddTab(browser(), GURL(url::kAboutBlankURL));
-
-  // Check each case with the origin chip enabled but query extraction disabled.
-  EXPECT_TRUE(chrome::ShouldDisplayOriginChip());
-  EXPECT_FALSE(chrome::IsQueryExtractionEnabled());
-  for (size_t i = 0; i < arraysize(test_items); ++i) {
-    const TestItem& test_item = test_items[i];
-    NavigateAndCheckText(test_item.url, base::string16(), false,
-                         test_item.should_display_url);
-  }
-
-  // Check with both enabled.
-  chrome::EnableQueryExtractionForTesting();
-  EXPECT_TRUE(chrome::IsQueryExtractionEnabled());
-  EXPECT_TRUE(browser()->toolbar_model()->url_replacement_enabled());
-  for (size_t i = 0; i < arraysize(test_items); ++i) {
-    const TestItem& test_item = test_items[i];
-    NavigateAndCheckText(test_item.url, test_item.expected_text_both,
-                         test_item.would_perform_search_term_replacement,
-                         test_item.should_display_url);
-  }
-
-  // Disabling URL replacement should reset to only showing URLs.
-  browser()->toolbar_model()->set_url_replacement_enabled(false);
-  for (size_t i = 0; i < arraysize(test_items); ++i) {
-    const TestItem& test_item = test_items[i];
-    NavigateAndCheckText(test_item.url,
-                         test_item.expected_text_url_replacement_inactive,
-                         false, test_item.should_display_url);
-  }
-}
-
  // Verify that search terms are extracted while the page is loading.
 TEST_F(ToolbarModelTest, SearchTermsWhileLoading) {
   chrome::EnableQueryExtractionForTesting();
   AddTab(browser(), GURL(url::kAboutBlankURL));
 
   // While loading, we should be willing to extract search terms.
   content::NavigationController* controller =
       &browser()->tab_strip_model()->GetWebContentsAt(0)->GetController();
   controller->LoadURL(GURL("https://google.com/search?q=tractor+supply&espv=1"),
                       content::Referrer(), ui::PAGE_TRANSITION_LINK,
@@ skipping 29 matching lines @@
   // The same URL, when specified on the command line, should allow search term
   // extraction.
   UIThreadSearchTermsData::SetGoogleBaseURL(std::string());
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(switches::kGoogleBaseURL,
                                                       "http://www.foo.com/");
   NavigateAndCheckText(
       GURL("http://www.foo.com/search?q=tractor+supply&espv=1"),
       base::ASCIIToUTF16("tractor supply"), true, true);
 }
 
-// Popup windows don't have an origin chip, so test that URL display in a popup
-// ignores whether the origin chip is enabled and only respects the query
-// extraction flag.
+// Test that URL display in a popup respects the query extraction flag.
 TEST_F(PopupToolbarModelTest, ShouldDisplayURL) {
   AddTab(browser(), GURL(url::kAboutBlankURL));
 
-  // Check with neither query extraction nor the origin chip enabled.
-  EXPECT_FALSE(chrome::ShouldDisplayOriginChip());
+  // Check with query extraction disabled.
   EXPECT_FALSE(chrome::IsQueryExtractionEnabled());
   for (size_t i = 0; i < arraysize(test_items); ++i) {
     const TestItem& test_item = test_items[i];
-    NavigateAndCheckText(test_item.url,
-                         test_item.expected_text_url_replacement_inactive,
-                         false, test_item.should_display_url);
-  }
-
-  // Check with the origin chip enabled.
-  EnableOriginChipFieldTrial();
-  EXPECT_TRUE(chrome::ShouldDisplayOriginChip());
-  EXPECT_FALSE(chrome::IsQueryExtractionEnabled());
-  for (size_t i = 0; i < arraysize(test_items); ++i) {
-    const TestItem& test_item = test_items[i];
     NavigateAndCheckText(test_item.url,
                          test_item.expected_text_url_replacement_inactive,
                          false, test_item.should_display_url);
   }
 
-  // With both origin chip and query extraction enabled, only search term
-  // replacement should be performed.
+  // With query extraction enabled, search term replacement should be performed.
   chrome::EnableQueryExtractionForTesting();
   EXPECT_TRUE(chrome::IsQueryExtractionEnabled());
   EXPECT_TRUE(browser()->toolbar_model()->url_replacement_enabled());
   for (size_t i = 0; i < arraysize(test_items); ++i) {
     const TestItem& test_item = test_items[i];
     NavigateAndCheckText(test_item.url,
                          test_item.expected_text_query_extraction,
                          test_item.would_perform_search_term_replacement,
                          test_item.should_display_url);
   }
 
   // Disabling URL replacement should reset to only showing URLs.
   browser()->toolbar_model()->set_url_replacement_enabled(false);
   for (size_t i = 0; i < arraysize(test_items); ++i) {
     const TestItem& test_item = test_items[i];
     NavigateAndCheckText(test_item.url,
                          test_item.expected_text_url_replacement_inactive,
                          false, test_item.should_display_url);
   }
 }