Misc. protector cleanup:

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 134 matching lines @@
 // This is test-only and should not be happening in real code.
 
 // |backup_url| in further test cases is owned by DefaultSearchProviderChange
 // instance, while other TemplateURLs are owned by TemplateURLService.
 
 IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest, BackupValid) {
   // Most common case: current default search provider exists, backup is valid,
   // they are different.
   TemplateURL* backup_url =
       MakeTemplateURL(example_info, ASCIIToUTF16("a"), http_example_info);
+  int backup_histogram_id = protector::GetSearchProviderHistogramID(backup_url);
   TemplateURL* current_url =
       MakeTemplateURL(example_com, ASCIIToUTF16("b"), http_example_com);
+  int current_histogram_id =
+      protector::GetSearchProviderHistogramID(current_url);
 
   AddCopy(backup_url);
   AddAndSetDefault(current_url);
 
   scoped_ptr<BaseSettingChange> change(
       CreateDefaultSearchProviderChange(current_url, backup_url));
   ASSERT_TRUE(change.get());
   ASSERT_TRUE(change->Init(browser()->profile()));
 
   // Verify that backup is active.
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
 
   // Verify histograms.
   ExpectHistogramCount(kProtectorHistogramSearchProviderHijacked,
-                       SEARCH_ENGINE_OTHER, 1);
+                       current_histogram_id, 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderRestored,
-                       SEARCH_ENGINE_OTHER, 1);
+                       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());
 
   // Discard does nothing - backup was already active.
   change->Discard(browser());
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
   ExpectHistogramCount(kProtectorHistogramSearchProviderDiscarded,
-                       SEARCH_ENGINE_OTHER, 1);
+                       current_histogram_id, 1);
 
   // Verify that Apply switches back to |current_url|.
   change->Apply(browser());
   EXPECT_EQ(FindTemplateURL(http_example_com),
             turl_service_->GetDefaultSearchProvider());
   ExpectHistogramCount(kProtectorHistogramSearchProviderApplied,
-                       SEARCH_ENGINE_OTHER, 1);
+                       current_histogram_id, 1);
 }
 
 IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest, BackupValidLongNames) {
   // Verify that search provider names that are too long are not displayed.
   TemplateURL* backup_url =
       MakeTemplateURL(example_info, ASCIIToUTF16("a"), http_example_info);
   TemplateURL* backup_url_long =
       MakeTemplateURL(example_info_long, ASCIIToUTF16("a"), http_example_info);
   TemplateURL* current_url =
       MakeTemplateURL(example_com, ASCIIToUTF16("b"), http_example_com);
@@ skipping 31 matching lines @@
     EXPECT_EQ(GetBubbleMessage(), change->GetBubbleMessage());
     EXPECT_EQ(GetChangeSearchButtonText(), change->GetApplyButtonText());
     EXPECT_EQ(GetKeepSearchButtonText(example_info),
               change->GetDiscardButtonText());
   }
 }
 
 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);
+  int current_histogram_id =
+      protector::GetSearchProviderHistogramID(current_url);
 
   AddAndSetDefault(current_url);
 
   // Prepopulated default search must exist.
   ASSERT_TRUE(FindTemplateURL(prepopulated_url_->url()->url()));
 
   scoped_ptr<BaseSettingChange> change(
       CreateDefaultSearchProviderChange(current_url, NULL));
   ASSERT_TRUE(change.get());
   ASSERT_TRUE(change->Init(browser()->profile()));
 
   // Verify that the prepopulated default search is active.
   EXPECT_EQ(FindTemplateURL(prepopulated_url_->url()->url()),
             turl_service_->GetDefaultSearchProvider());
 
   // Verify histograms.
   ExpectHistogramCount(kProtectorHistogramSearchProviderCorrupt,
-                       SEARCH_ENGINE_OTHER, 1);
+                       current_histogram_id, 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderRestored,
-                       prepopulated_url_->search_engine_type(), 1);
+                       prepopulated_histogram_id, 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderFallback,
-                       prepopulated_url_->search_engine_type(), 1);
+                       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());
 
   // Verify that search engine settings are opened by Discard.
   ExpectSettingsOpened(chrome::kSearchEnginesSubPage);
   change->Discard(browser());
   EXPECT_EQ(FindTemplateURL(prepopulated_url_->url()->url()),
             turl_service_->GetDefaultSearchProvider());
 
   // Verify that Apply switches back to |current_url|.
   change->Apply(browser());
   EXPECT_EQ(FindTemplateURL(http_example_com),
             turl_service_->GetDefaultSearchProvider());
 }
 
 IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest,
                        BackupInvalidFallbackRemoved) {
   // Backup is invalid, current search provider exists, fallback to the
   // prepopulated default search, which was removed from keywords (will be
   // added).
+  int prepopulated_histogram_id =
+      protector::GetSearchProviderHistogramID(prepopulated_url_.get());
   TemplateURL* current_url =
       MakeTemplateURL(example_com, ASCIIToUTF16("b"), http_example_com);
+  int current_histogram_id =
+      protector::GetSearchProviderHistogramID(current_url);
 
   AddAndSetDefault(current_url);
 
   const TemplateURL* prepopulated_default =
       FindTemplateURL(prepopulated_url_->url()->url());
   // Prepopulated default search must exist, remove it.
   ASSERT_TRUE(prepopulated_default);
   turl_service_->Remove(prepopulated_default);
 
   scoped_ptr<BaseSettingChange> change(
       CreateDefaultSearchProviderChange(current_url, NULL));
   ASSERT_TRUE(change.get());
   ASSERT_TRUE(change->Init(browser()->profile()));
 
   // Verify that the prepopulated default search is active.
   EXPECT_EQ(FindTemplateURL(prepopulated_url_->url()->url()),
             turl_service_->GetDefaultSearchProvider());
 
   // Verify histograms.
   ExpectHistogramCount(kProtectorHistogramSearchProviderCorrupt,
-                       SEARCH_ENGINE_OTHER, 1);
+                       current_histogram_id, 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderRestored,
-                       prepopulated_url_->search_engine_type(), 1);
+                       prepopulated_histogram_id, 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderFallback,
-                       prepopulated_url_->search_engine_type(), 1);
+                       prepopulated_histogram_id, 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderMissing,
-                       prepopulated_url_->search_engine_type(), 1);
+                       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());
 
   // Verify that search engine settings are opened by Discard.
   ExpectSettingsOpened(chrome::kSearchEnginesSubPage);
   change->Discard(browser());
   EXPECT_EQ(FindTemplateURL(prepopulated_url_->url()->url()),
             turl_service_->GetDefaultSearchProvider());
 
   // Verify that Apply switches back to |current_url|.
   change->Apply(browser());
   EXPECT_EQ(FindTemplateURL(http_example_com),
             turl_service_->GetDefaultSearchProvider());
 }
 
 IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest,
                        BackupValidCurrentRemoved) {
   // Backup is valid, no current search provider.
   TemplateURL* backup_url =
       MakeTemplateURL(example_info, ASCIIToUTF16("a"), http_example_info);
+  int backup_histogram_id = protector::GetSearchProviderHistogramID(backup_url);
 
   AddCopy(backup_url);
   turl_service_->SetDefaultSearchProvider(NULL);
 
   scoped_ptr<BaseSettingChange> change(
       CreateDefaultSearchProviderChange(NULL, backup_url));
   ASSERT_TRUE(change.get());
   ASSERT_TRUE(change->Init(browser()->profile()));
 
   // Verify that backup is active.
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
 
   // Verify histograms.
   ExpectHistogramCount(kProtectorHistogramSearchProviderHijacked,
-                       SEARCH_ENGINE_NONE, 1);
+                       protector::GetSearchProviderHistogramID(NULL), 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderRestored,
-                       SEARCH_ENGINE_OTHER, 1);
+                       backup_histogram_id, 1);
 
   // Verify text messages.
   EXPECT_EQ(GetBubbleMessage(), change->GetBubbleMessage());
   EXPECT_EQ(GetOpenSettingsButtonText(), change->GetApplyButtonText());
   EXPECT_EQ(GetKeepSearchButtonText(example_info),
             change->GetDiscardButtonText());
 
   // 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),
             turl_service_->GetDefaultSearchProvider());
 }
 
 IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest,
                        BackupInvalidCurrentRemoved) {
   // Backup is invalid, no current search provider, fallback to the prepopulated
   // default search.
+  int prepopulated_histogram_id =
+      protector::GetSearchProviderHistogramID(prepopulated_url_.get());
   turl_service_->SetDefaultSearchProvider(NULL);
 
   scoped_ptr<BaseSettingChange> change(
       CreateDefaultSearchProviderChange(NULL, NULL));
   ASSERT_TRUE(change.get());
   ASSERT_TRUE(change->Init(browser()->profile()));
 
   // Verify that the prepopulated default search is active.
   EXPECT_EQ(FindTemplateURL(prepopulated_url_->url()->url()),
             turl_service_->GetDefaultSearchProvider());
 
   // Verify histograms.
   ExpectHistogramCount(kProtectorHistogramSearchProviderCorrupt,
-                       SEARCH_ENGINE_NONE, 1);
+                       protector::GetSearchProviderHistogramID(NULL), 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderRestored,
-                       prepopulated_url_->search_engine_type(), 1);
+                       prepopulated_histogram_id, 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderFallback,
-                       prepopulated_url_->search_engine_type(), 1);
+                       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());
 
   // Verify that search engine settings are opened by Discard.
   ExpectSettingsOpened(chrome::kSearchEnginesSubPage);
   change->Discard(browser());
   EXPECT_EQ(FindTemplateURL(prepopulated_url_->url()->url()),
             turl_service_->GetDefaultSearchProvider());
 }
 
 IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest,
                        BackupInvalidFallbackSameAsCurrent) {
   // Backup is invalid, fallback to the prepopulated default search which is
   // same as the current search provider.
+  int prepopulated_histogram_id =
+      protector::GetSearchProviderHistogramID(prepopulated_url_.get());
   const TemplateURL* current_url = turl_service_->GetDefaultSearchProvider();
 
   // Verify that current search provider is same as the prepopulated default.
   ASSERT_TRUE(current_url);
   ASSERT_EQ(current_url, FindTemplateURL(prepopulated_url_->url()->url()));
 
   scoped_ptr<BaseSettingChange> change(
       CreateDefaultSearchProviderChange(current_url, NULL));
   ASSERT_TRUE(change.get());
   ASSERT_TRUE(change->Init(browser()->profile()));
 
   // Verify that the default search has not changed.
   EXPECT_EQ(current_url, turl_service_->GetDefaultSearchProvider());
 
   // Verify histograms.
   ExpectHistogramCount(kProtectorHistogramSearchProviderCorrupt,
-                       prepopulated_url_->search_engine_type(), 1);
+                       prepopulated_histogram_id, 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderRestored,
-                       prepopulated_url_->search_engine_type(), 1);
+                       prepopulated_histogram_id, 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderFallback,
-                       prepopulated_url_->search_engine_type(), 1);
+                       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());
 
   // Verify that search engine settings are opened by Discard.
   ExpectSettingsOpened(chrome::kSearchEnginesSubPage);
   change->Discard(browser());
@@ skipping 64 matching lines @@
   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