Commit f10bafe7 authored by Ian Wells's avatar Ian Wells Committed by Chromium LUCI CQ

Add flag for accepting EULA for testing feedv2 when FirstRunUtils.acceptEula() isn't available

Bug: 1152187
Change-Id: Ic0b044b6c1318d34b0107c1ec37c04aa2b0450ce
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2580780
Commit-Queue: Ian Wells <iwells@chromium.org>
Reviewed-by: default avatarDan H <harringtond@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836819}
parent 8d48f3c8
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <utility> #include <utility>
#include "base/command_line.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "components/feed/core/shared_prefs/pref_names.h" #include "components/feed/core/shared_prefs/pref_names.h"
#include "components/feed/core/v2/feed_network_impl.h" #include "components/feed/core/v2/feed_network_impl.h"
...@@ -110,7 +111,11 @@ class FeedService::StreamDelegateImpl : public FeedStream::Delegate { ...@@ -110,7 +111,11 @@ class FeedService::StreamDelegateImpl : public FeedStream::Delegate {
} }
// FeedStream::Delegate. // FeedStream::Delegate.
bool IsEulaAccepted() override { return eula_notifier_.IsEulaAccepted(); } bool IsEulaAccepted() override {
return eula_notifier_.IsEulaAccepted() ||
base::CommandLine::ForCurrentProcess()->HasSwitch(
"feedv2-accept-eula");
}
bool IsOffline() override { return net::NetworkChangeNotifier::IsOffline(); } bool IsOffline() override { return net::NetworkChangeNotifier::IsOffline(); }
DisplayMetrics GetDisplayMetrics() override { DisplayMetrics GetDisplayMetrics() override {
return service_delegate_->GetDisplayMetrics(); return service_delegate_->GetDisplayMetrics();
......
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