Revert of Don't use the DSE geolocation setting when chrome doesn't have location.

chrome/browser/android/search_geolocation/search_geolocation_service_unittest.cc

 // Copyright 2017 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/android/search_geolocation/search_geolocation_service.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "base/test/scoped_feature_list.h"
-#include "chrome/browser/android/mock_location_settings.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 46 matching lines @@
  public:
   void SetUp() override {
     scoped_feature_list_.InitAndEnableFeature(
         features::kConsistentOmniboxGeolocation);
 
     profile_.reset(new TestingProfile);
 
     auto test_delegate = base::MakeUnique<TestSearchEngineDelegate>();
     test_delegate_ = test_delegate.get();
     GetService()->SetSearchEngineDelegateForTest(std::move(test_delegate));
-
-    auto mock_settings = base::MakeUnique<MockLocationSettings>();
-    mock_settings->SetLocationStatus(
-        true /* has_android_location_permission */,
-        true /* is_system_location_setting_enabled */);
-    GetService()->SetLocationSettingsForTest(std::move(mock_settings));
   }
 
   void TearDown() override {
     test_delegate_ = nullptr;
     profile_.reset();
   }
 
   TestingProfile* profile() { return profile_.get(); }
 
   TestSearchEngineDelegate* test_delegate() { return test_delegate_; }
@@ skipping 52 matching lines @@
   ReinitializeService(true /* clear_pref */);
   EXPECT_TRUE(GetService()->UseDSEGeolocationSetting(ToOrigin(kGoogleURL)));
   EXPECT_TRUE(GetService()->GetDSEGeolocationSetting());
 
   // DSE setting initialized to false if the content setting is BLOCK.
   SetContentSetting(kGoogleURL, CONTENT_SETTING_BLOCK);
   ReinitializeService(true /* clear_pref */);
   EXPECT_TRUE(GetService()->UseDSEGeolocationSetting(ToOrigin(kGoogleURL)));
   EXPECT_FALSE(GetService()->GetDSEGeolocationSetting());
 
-  // Nothing happens if the pref is already set when the service is
-  // initialized.
+  // Nothing happens if the pref is already set when the service is initialized.
   SetContentSetting(kGoogleURL, CONTENT_SETTING_ASK);
   ReinitializeService(false /* clear_pref */);
   EXPECT_TRUE(GetService()->UseDSEGeolocationSetting(ToOrigin(kGoogleURL)));
   EXPECT_FALSE(GetService()->GetDSEGeolocationSetting());
 
   // For non-Google search engine, the setting may be initialized to true, but
   // it won't be used.
   test_delegate()->SetDSECCTLD(kExampleURL);
   SetContentSetting(kExampleURL, CONTENT_SETTING_ALLOW);
   ReinitializeService(true /* clear_pref */);
@@ skipping 120 matching lines @@
   test_delegate()->SetDSECCTLD(kExampleURL);
   EXPECT_FALSE(GetService()->UseDSEGeolocationSetting(ToOrigin(kGoogleAusURL)));
   EXPECT_FALSE(GetService()->UseDSEGeolocationSetting(ToOrigin(kExampleURL)));
 
   // Go back to google.com.au. The setting should still be false because that's
   // what it last was.
   test_delegate()->SetDSECCTLD(kGoogleAusURL);
   EXPECT_TRUE(GetService()->UseDSEGeolocationSetting(ToOrigin(kGoogleAusURL)));
   EXPECT_FALSE(GetService()->GetDSEGeolocationSetting());
 }