From bac1035f131c0b95b75fb39ffd1a39652843de9f Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 23 Sep 2019 16:06:29 +0200 Subject: BASELINE: Update Chromium to 77.0.3865.98 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ice85979eb8b64af9a3c649d719bec6ea14ac3bf7 Reviewed-by: Michael Brüning --- .../service/variations_field_trial_creator.cc | 4 +++- .../service/variations_field_trial_creator.h | 4 ++-- .../service/variations_field_trial_creator_unittest.cc | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) (limited to 'chromium/components/variations') diff --git a/chromium/components/variations/service/variations_field_trial_creator.cc b/chromium/components/variations/service/variations_field_trial_creator.cc index 5abe50de8a6..c35a39c14b7 100644 --- a/chromium/components/variations/service/variations_field_trial_creator.cc +++ b/chromium/components/variations/service/variations_field_trial_creator.cc @@ -388,9 +388,11 @@ std::string VariationsFieldTrialCreator::GetShortHardwareClass() { board.resize(index); return base::ToUpperASCII(board); +#elif defined(OS_ANDROID) + return base::SysInfo::HardwareModelName(); #else return std::string(); -#endif // OS_CHROMEOS +#endif } bool VariationsFieldTrialCreator::LoadSeed(VariationsSeed* seed, diff --git a/chromium/components/variations/service/variations_field_trial_creator.h b/chromium/components/variations/service/variations_field_trial_creator.h index 5159583fc77..40456a0c3c1 100644 --- a/chromium/components/variations/service/variations_field_trial_creator.h +++ b/chromium/components/variations/service/variations_field_trial_creator.h @@ -123,8 +123,8 @@ class VariationsFieldTrialCreator { const std::string& application_locale() const { return application_locale_; } // Returns the short hardware class value used to evaluate variations hardware - // class filters. Only implemented on CrOS - returns empty string on other - // platforms. + // class filters. Only implemented on CrOS and Android - returns empty string + // on other platforms. static std::string GetShortHardwareClass(); private: diff --git a/chromium/components/variations/service/variations_field_trial_creator_unittest.cc b/chromium/components/variations/service/variations_field_trial_creator_unittest.cc index 8da72309ea6..4925a3b0fd4 100644 --- a/chromium/components/variations/service/variations_field_trial_creator_unittest.cc +++ b/chromium/components/variations/service/variations_field_trial_creator_unittest.cc @@ -519,6 +519,24 @@ TEST_F(FieldTrialCreatorTest, SetupFieldTrials_LoadsCountryOnFirstRun) { EXPECT_EQ(kTestSeedExperimentName, base::FieldTrialList::FindFullName(kTestSeedStudyName)); } + +// Tests that the hardware class is set on Android. +TEST_F(FieldTrialCreatorTest, ClientFilterableState_HardwareClass) { + testing::NiceMock safe_seed_manager(&prefs_); + ON_CALL(safe_seed_manager, ShouldRunInSafeMode()) + .WillByDefault(Return(false)); + + TestVariationsServiceClient variations_service_client; + TestVariationsFieldTrialCreator field_trial_creator( + &prefs_, &variations_service_client, &safe_seed_manager); + + const base::Version& current_version = version_info::GetVersion(); + EXPECT_TRUE(current_version.IsValid()); + + std::unique_ptr client_filterable_state = + field_trial_creator.GetClientFilterableStateForVersion(current_version); + EXPECT_NE(client_filterable_state->hardware_class, std::string()); +} #endif // OS_ANDROID } // namespace variations -- cgit v1.2.1