+23
-38
lines changedFilter options
+23
-38
lines changed Original file line number Diff line number Diff line change
@@ -69,8 +69,22 @@ class CopyingFileOutputStream
69 69
base::File file_;
70 70
};
71 71 72 +
class FlocIdProviderComputationDisabledBrowserTest
73 +
: public InProcessBrowserTest {};
74 + 75 +
IN_PROC_BROWSER_TEST_F(FlocIdProviderComputationDisabledBrowserTest,
76 +
NoProvider) {
77 +
EXPECT_FALSE(FlocIdProviderFactory::GetForProfile(browser()->profile()));
78 +
}
79 + 72 80
class FlocIdProviderBrowserTest : public InProcessBrowserTest {
73 81
public:
82 +
FlocIdProviderBrowserTest() {
83 +
scoped_feature_list_.InitAndEnableFeatureWithParameters(
84 +
kFederatedLearningOfCohorts,
85 +
{{"minimum_history_domain_size_required", "1"}});
86 +
}
87 + 74 88
void SetUpOnMainThread() override {
75 89
host_resolver()->AddRule("*", "127.0.0.1");
76 90
https_server_.SetSSLConfig(net::EmbeddedTestServer::CERT_TEST_NAMES);
@@ -99,6 +113,8 @@ class FlocIdProviderBrowserTest : public InProcessBrowserTest {
99 113
std::string test_host() const { return "a.test"; }
100 114 101 115
protected:
116 +
base::test::ScopedFeatureList scoped_feature_list_;
117 + 102 118
net::EmbeddedTestServer https_server_{
103 119
net::test_server::EmbeddedTestServer::TYPE_HTTPS};
104 120
};
@@ -181,12 +197,6 @@ class MockFlocEventLogger : public FlocEventLogger {
181 197
class FlocIdProviderSortingLshUninitializedBrowserTest
182 198
: public FlocIdProviderBrowserTest {
183 199
public:
184 -
FlocIdProviderSortingLshUninitializedBrowserTest() {
185 -
scoped_feature_list_.InitAndEnableFeatureWithParameters(
186 -
kFederatedLearningOfCohorts,
187 -
{{"minimum_history_domain_size_required", "1"}});
188 -
}
189 - 190 200
void SetUpOnMainThread() override {
191 201
FlocIdProviderBrowserTest::SetUpOnMainThread();
192 202
ConfigureReplacementHostAndPortForRemotePermissionService();
@@ -495,8 +505,6 @@ class FlocIdProviderSortingLshUninitializedBrowserTest
495 505
setting);
496 506
}
497 507 498 -
base::test::ScopedFeatureList scoped_feature_list_;
499 - 500 508
// Owned by the floc id provider.
501 509
MockFlocEventLogger* floc_event_logger_ = nullptr;
502 510
@@ -15,6 +15,7 @@
15 15
#include "chrome/browser/profiles/profile.h"
16 16
#include "chrome/browser/sync/sync_service_factory.h"
17 17
#include "chrome/browser/sync/user_event_service_factory.h"
18 +
#include "components/federated_learning/features/features.h"
18 19
#include "components/history/core/browser/history_service.h"
19 20
#include "components/keyed_service/content/browser_context_dependency_manager.h"
20 21
#include "components/sync/driver/sync_service.h"
@@ -48,6 +49,9 @@ FlocIdProviderFactory::~FlocIdProviderFactory() = default;
48 49 49 50
KeyedService* FlocIdProviderFactory::BuildServiceInstanceFor(
50 51
content::BrowserContext* context) const {
52 +
if (!base::FeatureList::IsEnabled(kFederatedLearningOfCohorts))
53 +
return nullptr;
54 + 51 55
Profile* profile = Profile::FromBrowserContext(context);
52 56 53 57
syncer::SyncService* sync_service =
@@ -198,6 +198,8 @@ class PrivacySandboxSettingsBrowserPolicyTest
198 198
// policy, but should run if the policy is changed or removed.
199 199
IN_PROC_BROWSER_TEST_F(PrivacySandboxSettingsBrowserPolicyTest,
200 200
DelayedReconciliationCookieSettingsManaged) {
201 +
privacy_sandbox_settings();
202 + 201 203
// Policies set in the test constructor should have prevented reconciliation
202 204
// from running immediately.
203 205
EXPECT_FALSE(browser()->profile()->GetPrefs()->GetBoolean(
@@ -34,7 +34,7 @@ const base::Feature kFlocPagesWithAdResourcesDefaultIncludedInFlocComputation{
34 34
// required.
35 35
// TODO(yaoxia): merge other floc features into this one.
36 36
const base::Feature kFederatedLearningOfCohorts{
37 -
"FederatedLearningOfCohorts", base::FEATURE_ENABLED_BY_DEFAULT};
37 +
"FederatedLearningOfCohorts", base::FEATURE_DISABLED_BY_DEFAULT};
38 38
constexpr base::FeatureParam<base::TimeDelta> kFlocIdScheduledUpdateInterval{
39 39
&kFederatedLearningOfCohorts, "update_interval",
40 40
base::TimeDelta::FromDays(7)};
@@ -4475,35 +4475,6 @@
4475 4475
]
4476 4476
}
4477 4477
],
4478 -
"InterestCohortAPIOriginTrial": [
4479 -
{
4480 -
"platforms": [
4481 -
"android",
4482 -
"chromeos",
4483 -
"chromeos_lacros",
4484 -
"linux",
4485 -
"mac",
4486 -
"windows"
4487 -
],
4488 -
"experiments": [
4489 -
{
4490 -
"name": "Enabled_50",
4491 -
"params": {
4492 -
"finch_config_version": "2",
4493 -
"minimum_history_domain_size_required": "7",
4494 -
"update_interval": "168h"
4495 -
},
4496 -
"enable_features": [
4497 -
"FederatedLearningOfCohorts",
4498 -
"FlocIdSortingLshBasedComputation",
4499 -
"FlocPagesWithAdResourcesDefaultIncludedInFlocComputation",
4500 -
"InterestCohortAPIOriginTrial",
4501 -
"InterestCohortFeaturePolicy"
4502 -
]
4503 -
}
4504 -
]
4505 -
}
4506 -
],
4507 4478
"InterestFeedContentSuggestions": [
4508 4479
{
4509 4480
"platforms": [
You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4