BASELINE: Update Chromium to 61.0.3163.99

Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 18 insertions, 2 deletions

diff --git a/chromium/components/feature_engagement_tracker/internal/feature_engagement_tracker_impl.cc b/chromium/components/feature_engagement_tracker/internal/feature_engagement_tracker_impl.cc
index 9d92884481c..f9ccba5354d 100644
--- a/chromium/components/feature_engagement_tracker/internal/feature_engagement_tracker_impl.cc
+++ b/chromium/components/feature_engagement_tracker/internal/feature_engagement_tracker_impl.cc
@@ -9,6 +9,8 @@
 
 #include "base/bind.h"
 #include "base/feature_list.h"
+#include "base/files/file_path.h"
+#include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial_params.h"
 #include "base/metrics/user_metrics.h"
@@ -35,8 +37,10 @@
 namespace feature_engagement_tracker {
 
 namespace {
-const char kEventDBStorageDir[] = "EventDB";
-const char kAvailabilityDBStorageDir[] = "AvailabilityDB";
+const base::FilePath::CharType kEventDBStorageDir[] =
+    FILE_PATH_LITERAL("EventDB");
+const base::FilePath::CharType kAvailabilityDBStorageDir[] =
+    FILE_PATH_LITERAL("AvailabilityDB");
 
 // Creates a FeatureEngagementTrackerImpl that is usable for a demo mode.
 std::unique_ptr<FeatureEngagementTracker>
@@ -46,6 +50,8 @@ CreateDemoModeFeatureEngagementTracker() {
   std::string chosen_feature_name = base::GetFieldTrialParamValueByFeature(
       kIPHDemoMode, kIPHDemoModeFeatureChoiceParam);
 
+  DVLOG(2) << "Enabling demo mode. Chosen feature: " << chosen_feature_name;
+
   std::unique_ptr<EditableConfiguration> configuration =
       base::MakeUnique<EditableConfiguration>();
 
@@ -85,6 +91,7 @@ CreateDemoModeFeatureEngagementTracker() {
 FeatureEngagementTracker* FeatureEngagementTracker::Create(
     const base::FilePath& storage_dir,
     const scoped_refptr<base::SequencedTaskRunner>& background_task_runner) {
+  DVLOG(2) << "Creating FeatureEngagementTracker";
   if (base::FeatureList::IsEnabled(kIPHDemoMode))
     return CreateDemoModeFeatureEngagementTracker().release();
 
@@ -175,10 +182,13 @@ bool FeatureEngagementTrackerImpl::ShouldTriggerHelpUI(
   }
 
   stats::RecordShouldTriggerHelpUI(feature, result);
+  DVLOG(2) << "Trigger result for " << feature.name
+           << ": trigger=" << result.NoErrors() << " " << result;
   return result.NoErrors();
 }
 
 void FeatureEngagementTrackerImpl::Dismissed(const base::Feature& feature) {
+  DVLOG(2) << "Dismissing " << feature.name;
   condition_validator_->NotifyDismissed(feature);
   stats::RecordUserDismiss();
 }
@@ -203,6 +213,8 @@ void FeatureEngagementTrackerImpl::OnEventModelInitializationFinished(
   DCHECK_EQ(success, model_->IsReady());
   event_model_initialization_finished_ = true;
 
+  DVLOG(2) << "Event model initialization result = " << success;
+
   MaybePostInitializedCallbacks();
 }
 
@@ -211,6 +223,8 @@ void FeatureEngagementTrackerImpl::OnAvailabilityModelInitializationFinished(
   DCHECK_EQ(success, availability_model_->IsReady());
   availability_model_initialization_finished_ = true;
 
+  DVLOG(2) << "Availability model initialization result = " << success;
+
   MaybePostInitializedCallbacks();
 }
 
@@ -223,6 +237,8 @@ void FeatureEngagementTrackerImpl::MaybePostInitializedCallbacks() {
   if (!IsInitializationFinished())
     return;
 
+  DVLOG(2) << "Initialization finished.";
+
   for (auto& callback : on_initialized_callbacks_) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(callback, IsInitialized()));