[protector] Support for collapsing multiple changes into a single one.

chrome/browser/protector/default_search_provider_change_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 "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/protector/histograms.h"
 #include "chrome/browser/protector/mock_protector_service.h"
@@ skipping 15 matching lines @@
 using ::testing::Return;
 
 namespace protector {
 
 namespace {
 
 // Keyword names and URLs used for testing.
 
 const string16 example_info = ASCIIToUTF16("Example.info");
 const string16 example_info_long = ASCIIToUTF16("ExampleSearchEngine.info");
-const std::string http_example_info = "http://example.info/%s";
+const std::string http_example_info = "http://example.info/?q={searchTerms}";
+const std::string example_info_domain = "example.info";
 const string16 example_com = ASCIIToUTF16("Example.com");
 const string16 example_com_long = ASCIIToUTF16("ExampleSearchEngine.com");
-const std::string http_example_com = "http://example.com/%s";
+const std::string http_example_com = "http://example.com/?q={searchTerms}";
+const std::string example_com_domain = "example.com";
 const string16 example_net = ASCIIToUTF16("Example.net");
-const std::string http_example_net = "http://example.net/%s";
+const std::string http_example_net = "http://example.net/?q={searchTerms}";
+const std::string example_domain = "example.net";
+
+const BaseSettingChange::DisplayName kNoDisplayName(
+    BaseSettingChange::kDefaultNamePriority, string16());
 
 // Convenience function.
 TemplateURL* MakeTemplateURL(const string16& short_name,
                              const string16& keyword,
                              const std::string& url) {
   TemplateURLData data;
   data.short_name = short_name;
   if (keyword.empty())
     data.SetAutogenerateKeyword(true);
   else
@@ skipping 118 matching lines @@
                        current_histogram_id, 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderRestored,
                        backup_histogram_id, 1);
 
   // Verify text messages.
   EXPECT_EQ(GetBubbleMessage(), change->GetBubbleMessage());
   EXPECT_EQ(GetChangeSearchButtonText(example_com),
             change->GetApplyButtonText());
   EXPECT_EQ(GetKeepSearchButtonText(example_info),
             change->GetDiscardButtonText());
+  EXPECT_EQ(example_com_domain, change->GetApplyKeyword());
+  EXPECT_EQ(example_com, change->GetApplyDisplayName().second);
 
   // Discard does nothing - backup was already active.
   change->Discard(browser());
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
   ExpectHistogramCount(kProtectorHistogramSearchProviderDiscarded,
                        current_histogram_id, 1);
 
   // Verify that Apply switches back to |current_url|.
   change->Apply(browser());
@@ skipping 22 matching lines @@
     scoped_ptr<BaseSettingChange> change(
         CreateDefaultSearchProviderChange(current_url, backup_url_long));
     ASSERT_TRUE(change.get());
     ASSERT_TRUE(change->Init(browser()->profile()));
 
     // Verify text messages.
     EXPECT_EQ(GetBubbleMessage(), change->GetBubbleMessage());
     EXPECT_EQ(GetChangeSearchButtonText(example_com),
               change->GetApplyButtonText());
     EXPECT_EQ(GetKeepSearchButtonText(), change->GetDiscardButtonText());
+    EXPECT_EQ(example_com_domain, change->GetApplyKeyword());
+    EXPECT_EQ(example_com, change->GetApplyDisplayName().second);
   }
 
   {
     // Current name too long.
     turl_service_->Add(new TemplateURL(backup_url->data()));
     AddAndSetDefault(current_url_long);
 
     scoped_ptr<BaseSettingChange> change(
         CreateDefaultSearchProviderChange(current_url_long, backup_url));
     ASSERT_TRUE(change.get());
     ASSERT_TRUE(change->Init(browser()->profile()));
 
     // Verify text messages.
     EXPECT_EQ(GetBubbleMessage(), change->GetBubbleMessage());
     EXPECT_EQ(GetChangeSearchButtonText(), change->GetApplyButtonText());
     EXPECT_EQ(GetKeepSearchButtonText(example_info),
               change->GetDiscardButtonText());
+    EXPECT_EQ(example_com_domain, change->GetApplyKeyword());
+    EXPECT_EQ(kNoDisplayName, change->GetApplyDisplayName());
   }
 }
 
 IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest, BackupInvalid) {
   // Backup is invalid, current search provider exists, fallback to the
   // prepopulated default search, which exists among keywords.
   int prepopulated_histogram_id =
       protector::GetSearchProviderHistogramID(prepopulated_url_.get());
   TemplateURL* current_url =
       MakeTemplateURL(example_com, ASCIIToUTF16("b"), http_example_com);
@@ skipping 79 matching lines @@
                        prepopulated_histogram_id, 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderMissing,
                        prepopulated_histogram_id, 1);
 
   // Verify text messages.
   EXPECT_EQ(GetBubbleMessage(prepopulated_url_->short_name()),
             change->GetBubbleMessage());
   EXPECT_EQ(GetChangeSearchButtonText(example_com),
             change->GetApplyButtonText());
   EXPECT_EQ(GetOpenSettingsButtonText(), change->GetDiscardButtonText());
+  EXPECT_EQ(std::string(), change->GetApplyKeyword());
+  EXPECT_EQ(example_com, change->GetApplyDisplayName().second);
 
   // Verify that search engine settings are opened by Discard.
   ExpectSettingsOpened(chrome::kSearchEnginesSubPage);
   change->Discard(browser());
   EXPECT_EQ(FindTemplateURL(prepopulated_url_->url()),
             turl_service_->GetDefaultSearchProvider());
 
   // Verify that Apply switches back to |current_url|.
   change->Apply(browser());
   EXPECT_EQ(FindTemplateURL(http_example_com),
@@ skipping 23 matching lines @@
   ExpectHistogramCount(kProtectorHistogramSearchProviderHijacked,
                        protector::GetSearchProviderHistogramID(NULL), 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderRestored,
                        backup_histogram_id, 1);
 
   // Verify text messages.
   EXPECT_EQ(GetBubbleMessage(), change->GetBubbleMessage());
   EXPECT_EQ(GetOpenSettingsButtonText(), change->GetApplyButtonText());
   EXPECT_EQ(GetKeepSearchButtonText(example_info),
             change->GetDiscardButtonText());
+  EXPECT_EQ(std::string(), change->GetApplyKeyword());
+  EXPECT_EQ(kNoDisplayName, change->GetApplyDisplayName());
 
   // Discard does nothing - backup was already active.
   change->Discard(browser());
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
 
    // Verify that search engine settings are opened by Apply (no other changes).
   ExpectSettingsOpened(chrome::kSearchEnginesSubPage);
   change->Apply(browser());
   EXPECT_EQ(FindTemplateURL(http_example_info),
@@ skipping 23 matching lines @@
   ExpectHistogramCount(kProtectorHistogramSearchProviderRestored,
                        prepopulated_histogram_id, 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderFallback,
                        prepopulated_histogram_id, 1);
 
   // Verify text messages.
   EXPECT_EQ(GetBubbleMessage(prepopulated_url_->short_name()),
             change->GetBubbleMessage());
   EXPECT_EQ(string16(), change->GetApplyButtonText());
   EXPECT_EQ(GetOpenSettingsButtonText(), change->GetDiscardButtonText());
+  EXPECT_EQ(std::string(), change->GetApplyKeyword());
+  EXPECT_EQ(kNoDisplayName, change->GetApplyDisplayName());
 
   // Verify that search engine settings are opened by Discard.
   ExpectSettingsOpened(chrome::kSearchEnginesSubPage);
   change->Discard(browser());
   EXPECT_EQ(FindTemplateURL(prepopulated_url_->url()),
             turl_service_->GetDefaultSearchProvider());
 }
 
 IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest,
                        BackupInvalidFallbackSameAsCurrent) {
@@ skipping 21 matching lines @@
   ExpectHistogramCount(kProtectorHistogramSearchProviderRestored,
                        prepopulated_histogram_id, 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderFallback,
                        prepopulated_histogram_id, 1);
 
   // Verify text messages.
   EXPECT_EQ(GetBubbleMessage(prepopulated_url_->short_name()),
             change->GetBubbleMessage());
   EXPECT_EQ(string16(), change->GetApplyButtonText());
   EXPECT_EQ(GetOpenSettingsButtonText(), change->GetDiscardButtonText());
+  EXPECT_EQ(std::string(), change->GetApplyKeyword());
+  EXPECT_EQ(current_url->short_name(), change->GetApplyDisplayName().second);
 
   // Verify that search engine settings are opened by Discard.
   ExpectSettingsOpened(chrome::kSearchEnginesSubPage);
   change->Discard(browser());
   EXPECT_EQ(current_url, turl_service_->GetDefaultSearchProvider());
 }
 
 
 IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest,
                        DefaultSearchProviderChangedByUser) {
@@ skipping 44 matching lines @@
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
 
   turl_service_->Remove(current_url);
 
   // Verify that text messages altered after removing |current_url|.
   EXPECT_EQ(GetBubbleMessage(), change->GetBubbleMessage());
   EXPECT_EQ(GetOpenSettingsButtonText(), change->GetApplyButtonText());
   EXPECT_EQ(GetKeepSearchButtonText(example_info),
             change->GetDiscardButtonText());
+  EXPECT_EQ(std::string(), change->GetApplyKeyword());
+  EXPECT_EQ(kNoDisplayName, change->GetApplyDisplayName());
 
   // Verify that search engine settings are opened by Apply.
   ExpectSettingsOpened(chrome::kSearchEnginesSubPage);
   change->Apply(browser());
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
 
   // Discard does nothing - backup was already active.
   change->Discard(browser());
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
 }
 
 }  // namespace protector