Flip Release Notes feature flag.
Temporarily disabling CrOS release notes for Browser tests due to Locale specific spacing issue.
http://crbug.com/991767
[email protected]
(cherry picked from commit 17a965bae60ddb21bfc8fb441bb744405a75d43c)
Bug: 968372
Change-Id: Ia9ce5903b68a8b60085967aeb310196be4c7ae25
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1741478
Commit-Queue: Yulun Wu <[email protected]>
Reviewed-by: Alexander Alekseev <[email protected]>
Reviewed-by: Toni Baržić <[email protected]>
Auto-Submit: Yulun Wu <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#685050}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1742994
Cr-Commit-Position: refs/branch-heads/3865@{#288}
Cr-Branched-From: 0cdcc6158160790658d1f033d3db873603250124-refs/heads/master@{#681094}
diff --git a/chrome/browser/chromeos/release_notes/release_notes_storage.cc b/chrome/browser/chromeos/release_notes/release_notes_storage.cc
index 4238c43..38fac21 100644
--- a/chrome/browser/chromeos/release_notes/release_notes_storage.cc
+++ b/chrome/browser/chromeos/release_notes/release_notes_storage.cc
@@ -4,17 +4,20 @@
#include "chrome/browser/chromeos/release_notes/release_notes_storage.h"
+#include "base/command_line.h"
#include "base/version.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/policy/profile_policy_connector.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/channel_info.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chromeos/login/login_state/login_state.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
#include "components/user_manager/user_manager.h"
#include "components/version_info/version_info.h"
+#include "content/public/common/content_switches.h"
namespace {
@@ -36,6 +39,17 @@
ReleaseNotesStorage::~ReleaseNotesStorage() = default;
bool ReleaseNotesStorage::ShouldNotify() {
+ // TODO: remove after fixing http://crbug.com/991767.
+ const base::CommandLine* current_command_line =
+ base::CommandLine::ForCurrentProcess();
+ const bool is_running_test =
+ current_command_line->HasSwitch(::switches::kTestName) ||
+ current_command_line->HasSwitch(::switches::kTestType);
+ if (is_running_test) {
+ DLOG(WARNING) << "Ignoring Release Notes Notification for test.";
+ return false;
+ }
+
std::string user_email = profile_->GetProfileUserName();
if (base::EndsWith(user_email, "@google.com",
base::CompareCase::INSENSITIVE_ASCII) ||
diff --git a/chromeos/constants/chromeos_features.cc b/chromeos/constants/chromeos_features.cc
index 5567531..e57bd35f 100644
--- a/chromeos/constants/chromeos_features.cc
+++ b/chromeos/constants/chromeos_features.cc
@@ -125,9 +125,8 @@
"ShowBluetoothDeviceBattery", base::FEATURE_DISABLED_BY_DEFAULT};
// Enables or disables Release Notes on Chrome OS.
-// TODO(yulunwu): http://crbug.com/978201
const base::Feature kReleaseNotes{"ReleaseNotes",
- base::FEATURE_DISABLED_BY_DEFAULT};
+ base::FEATURE_ENABLED_BY_DEFAULT};
// Uses the V3 (~2019-05 era) Smart Dim model instead of the default V2
// (~2018-11) model.
