Commit c72c50b1 authored by Yue Ru Sun's avatar Yue Ru Sun Committed by Commit Bot

Remove obsolete code in ukm browser test

Change-Id: Ia282a1b720ec4cb5d6e376692b34dbd4c2aef891
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2274108Reviewed-by: default avatarSteven Holte <holte@chromium.org>
Commit-Queue: Yue Ru Sun <yrsun@chromium.org>
Cr-Commit-Position: refs/heads/master@{#784176}
parent e91d3374
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/browser/sync/profile_sync_service_factory.h"
#include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
#include "chrome/browser/sync/test/integration/secondary_account_helper.h" #include "chrome/browser/sync/test/integration/secondary_account_helper.h"
#include "chrome/browser/sync/test/integration/single_client_status_change_checker.h"
#include "chrome/browser/sync/test/integration/sync_test.h" #include "chrome/browser/sync/test/integration/sync_test.h"
#include "chrome/browser/unified_consent/unified_consent_service_factory.h" #include "chrome/browser/unified_consent/unified_consent_service_factory.h"
#include "components/metrics/demographic_metrics_provider.h" #include "components/metrics/demographic_metrics_provider.h"
...@@ -199,21 +198,6 @@ class MetricsConsentOverride { ...@@ -199,21 +198,6 @@ class MetricsConsentOverride {
bool state_; bool state_;
}; };
class SyncConnectionOkChecker : public SingleClientStatusChangeChecker {
public:
explicit SyncConnectionOkChecker(syncer::ProfileSyncService* service)
: SingleClientStatusChangeChecker(service) {}
bool IsExitConditionSatisfied(std::ostream* os) override {
*os << "Waiting for CONNECTION_OK.";
return service()->GetSyncTokenStatusForDebugging().connection_status ==
syncer::CONNECTION_OK;
}
private:
DISALLOW_COPY_AND_ASSIGN(SyncConnectionOkChecker);
};
// Test fixture that provides access to some UKM internals. // Test fixture that provides access to some UKM internals.
class UkmBrowserTestBase : public SyncTest { class UkmBrowserTestBase : public SyncTest {
public: public:
...@@ -402,28 +386,6 @@ class UkmConsentParamBrowserTest : public UkmBrowserTestBase, ...@@ -402,28 +386,6 @@ class UkmConsentParamBrowserTest : public UkmBrowserTestBase,
}; };
#endif // !defined(OS_ANDROID) #endif // !defined(OS_ANDROID)
class UkmEnabledChecker : public SingleClientStatusChangeChecker {
public:
UkmEnabledChecker(syncer::ProfileSyncService* service,
ukm::UkmTestHelper* ukm_test_helper,
bool want_enabled)
: SingleClientStatusChangeChecker(service),
ukm_test_helper_(ukm_test_helper),
want_enabled_(want_enabled) {}
// StatusChangeChecker:
bool IsExitConditionSatisfied(std::ostream* os) override {
*os << "Waiting for IsUkmEnabled=" << (want_enabled_ ? "true" : "false");
return ukm_test_helper_->IsRecordingEnabled() == want_enabled_;
}
private:
ukm::UkmTestHelper* const ukm_test_helper_;
const bool want_enabled_;
DISALLOW_COPY_AND_ASSIGN(UkmEnabledChecker);
};
// Test the reporting of the synced user's birth year and gender. // Test the reporting of the synced user's birth year and gender.
class UkmBrowserTestWithDemographics class UkmBrowserTestWithDemographics
: public UkmBrowserTestBase, : public UkmBrowserTestBase,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment