Permission Action Reporting: Do not report for Custom Passphrase users.

chrome/browser/permissions/permission_uma_util.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/permissions/permission_uma_util.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 542 matching lines @@
 
   DCHECK(profile);
   if (profile->GetProfileType() == Profile::INCOGNITO_PROFILE)
     return false;
   if (!profile->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled))
     return false;
 
   ProfileSyncService* profile_sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile);
 
-  // Do not report if profile can't get a profile sync service due to disable
-  // sync flag.
-  if (!profile_sync_service)
+
+  // Do not report if profile can't get a profile sync service or sync cannot
+  // start.
+  if (!(profile_sync_service && profile_sync_service->CanSyncStart()))
     return false;
 
-  if (!profile_sync_service->CanSyncStart())
+  // Do not report for users with a Custom passphrase set. We need to wait for
+  // Sync to be active in order to check the passphrase, so we don't report if
+  // Sync is not active yet.
+  if (!profile_sync_service->IsSyncActive() ||
+      profile_sync_service->IsUsingSecondaryPassphrase()) {
     return false;
+  }
 
   syncer::ModelTypeSet preferred_data_types =
       profile_sync_service->GetPreferredDataTypes();
-  if (!preferred_data_types.Has(syncer::PROXY_TABS))
+  if (!(preferred_data_types.Has(syncer::PROXY_TABS) &&
+        preferred_data_types.Has(syncer::PRIORITY_PREFERENCES))) {
     return false;
-  if (!preferred_data_types.Has(syncer::PRIORITY_PREFERENCES))
-    return false;
+  }
 
   return true;
 }
 
 void PermissionUmaUtil::RecordPermissionAction(
     PermissionType permission,
     PermissionAction action,
     PermissionSourceUI source_ui,
     PermissionRequestGestureType gesture_type,
     const GURL& requesting_origin,
@@ skipping 79 matching lines @@
   if (!deprecated_metric.empty() && rappor_service) {
     rappor::SampleDomainAndRegistryFromGURL(rappor_service, deprecated_metric,
                                             requesting_origin);
 
     std::string rappor_metric = deprecated_metric + "2";
     rappor_service->RecordSample(
         rappor_metric, rappor::LOW_FREQUENCY_ETLD_PLUS_ONE_RAPPOR_TYPE,
         rappor::GetDomainAndRegistrySampleFromGURL(requesting_origin));
   }
 }