Enable NoSearchDomainCheck by default.

Also remove the field trial configuration for the associated features.

Bug: 973591
Change-Id: I409c71cb7bee08aaa57150df14088f49c18c92ab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1657920Reviewed-by: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Mark Pearson <mpearson@chromium.org>
Commit-Queue: Quentin Fiard <qfiard@google.com>
Cr-Commit-Position: refs/heads/master@{#672004}

chrome/browser/google/google_url_tracker_factory_unittest.cc

@@ -30,24 +30,24 @@ class GoogleURLTrackerFactoryTest : public testing::Test {
   base::test::ScopedFeatureList scoped_feature_list_;
 };
 
-TEST_F(GoogleURLTrackerFactoryTest, UsesLocalDomainByDefault) {
+TEST_F(GoogleURLTrackerFactoryTest, UsesDotComByDefault) {
   profile_.GetPrefs()->SetString(prefs::kLastKnownGoogleURL,
                                  "https://www.google.co.uk/");
   GoogleURLTracker* tracker =
       GoogleURLTrackerFactory::GetInstance()->GetForProfile(&profile_);
 
   ASSERT_NE(nullptr, tracker);
-  EXPECT_EQ(GURL("https://www.google.co.uk/"), tracker->google_url());
+  EXPECT_EQ(GURL("https://www.google.com/"), tracker->google_url());
 }
 
-TEST_F(GoogleURLTrackerFactoryTest, UsesDotComWithNoSearchDomainCheck) {
+TEST_F(GoogleURLTrackerFactoryTest, UsesLocalDomainWithSearchDomainCheck) {
   profile_.GetPrefs()->SetString(prefs::kLastKnownGoogleURL,
                                  "https://www.google.co.uk/");
-  scoped_feature_list_.InitAndEnableFeature(
+  scoped_feature_list_.InitAndDisableFeature(
       GoogleURLTracker::kNoSearchDomainCheck);
   GoogleURLTracker* tracker =
       GoogleURLTrackerFactory::GetInstance()->GetForProfile(&profile_);
 
   ASSERT_NE(nullptr, tracker);
-  EXPECT_EQ(GURL("https://www.google.com/"), tracker->google_url());
+  EXPECT_EQ(GURL("https://www.google.co.uk/"), tracker->google_url());
 }

components/google/core/browser/google_url_tracker.cc

@@ -28,7 +28,7 @@ const char GoogleURLTracker::kDefaultGoogleHomepage[] =
 const char GoogleURLTracker::kSearchDomainCheckURL[] =
     "https://www.google.com/searchdomaincheck?format=domain&type=chrome";
 const base::Feature GoogleURLTracker::kNoSearchDomainCheck{
-    "NoSearchDomainCheck", base::FEATURE_DISABLED_BY_DEFAULT};
+    "NoSearchDomainCheck", base::FEATURE_ENABLED_BY_DEFAULT};
 
 GoogleURLTracker::GoogleURLTracker(
     std::unique_ptr<GoogleURLTrackerClient> client,

testing/variations/fieldtrial_testing_config.json

@@ -1943,25 +1943,6 @@
             ]
         }
     ],
-    "EmitGoogleSearchDomainMixingMetrics": [
-        {
-            "platforms": [
-                "android",
-                "chromeos",
-                "linux",
-                "mac",
-                "windows"
-            ],
-            "experiments": [
-                {
-                    "name": "Enabled",
-                    "enable_features": [
-                        "EmitGoogleSearchDomainMixingMetrics"
-                    ]
-                }
-            ]
-        }
-    ],
     "EnableAppContainer": [
         {
             "platforms": [
@@ -3358,25 +3339,6 @@
             ]
         }
     ],
-    "NoSearchDomainCheck": [
-        {
-            "platforms": [
-                "android",
-                "chromeos",
-                "linux",
-                "mac",
-                "windows"
-            ],
-            "experiments": [
-                {
-                    "name": "Enabled",
-                    "enable_features": [
-                        "NoSearchDomainCheck"
-                    ]
-                }
-            ]
-        }
-    ],
     "OfferUploadCreditCards": [
         {
             "platforms": [