Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1100)

Unified Diff: chrome/browser/android/search_geolocation/search_geolocation_service_unittest.cc

Issue 2811073003: Revert of Don't use the DSE geolocation setting when chrome doesn't have location. (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/search_geolocation/search_geolocation_service_unittest.cc
diff --git a/chrome/browser/android/search_geolocation/search_geolocation_service_unittest.cc b/chrome/browser/android/search_geolocation/search_geolocation_service_unittest.cc
index d46864eb03f2dcab61b1ba563770ff6e490573f2..a74026eba5ce0d6d8f16bbc0c53479b6cbf791e2 100644
--- a/chrome/browser/android/search_geolocation/search_geolocation_service_unittest.cc
+++ b/chrome/browser/android/search_geolocation/search_geolocation_service_unittest.cc
@@ -10,7 +10,6 @@
#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"
@@ -77,12 +76,6 @@
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 {
@@ -155,8 +148,7 @@
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)));

Powered by Google App Engine
This is Rietveld 408576698