Add tests for the permission context class

chrome/browser/content_settings/permission_context_base.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/content_settings/permission_context_base.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
@@ skipping 57 matching lines @@
       NotifyPermissionSet(id, requesting_origin, embedder_origin,
                            callback, false /* persist */, false /* granted */);
       return;
     case CONTENT_SETTING_ALLOW:
       NotifyPermissionSet(id, requesting_origin, embedder_origin,
                            callback, false /* persist */, true /* granted */);
       return;
     default:
       break;
   }
-
   UMA_HISTOGRAM_ENUMERATION("ContentSettings.PermissionRequested",
                             SettingToPermission(permission_type_),
                             PERMISSION_NUM);
 
   if (PermissionBubbleManager::Enabled()) {
     PermissionBubbleManager* bubble_manager =
         PermissionBubbleManager::FromWebContents(web_contents);
     DCHECK(bubble_manager);
     scoped_ptr<PermissionBubbleRequest> request_ptr(
         new PermissionBubbleRequestImpl(
@@ skipping 36 matching lines @@
                  false));
 }
 
 void PermissionContextBase::PermissionDecided(
     const PermissionRequestID& id,
     const GURL& requesting_origin,
     const GURL& embedder_origin,
     const BrowserPermissionCallback& callback,
     bool persist,
     bool allowed) {
-  UMA_HISTOGRAM_ENUMERATION(allowed
-                            ? "ContentSettings.PermissionGranted"
-                                : "ContentSettings.PermissionDenied",
-                            SettingToPermission(permission_type_),
-                            PERMISSION_NUM);
+  if (allowed) {

[Miguel Garcia, 2014/07/08 11:27:25]

Since the dependent change has not landed yet I'll fix it there as well but just
FYI

+    UMA_HISTOGRAM_ENUMERATION("ContentSettings.PermissionGranted",
+                              SettingToPermission(permission_type_),
+                              PERMISSION_NUM);
+  } else {
+    UMA_HISTOGRAM_ENUMERATION("ContentSettings.PermissionDenied",
+                              SettingToPermission(permission_type_),
+                              PERMISSION_NUM);
+  }
+
   NotifyPermissionSet(
       id, requesting_origin, embedder_origin, callback, persist, allowed);
 }
 
 PermissionQueueController* PermissionContextBase::GetQueueController() {
   return permission_queue_controller_.get();
 }
 
 void PermissionContextBase::NotifyPermissionSet(
     const PermissionRequestID& id,
@@ skipping 37 matching lines @@
   DCHECK_EQ(embedder_origin, embedder_origin.GetOrigin());
   ContentSetting content_setting =
       allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
   profile_->GetHostContentSettingsMap()->SetContentSetting(
       ContentSettingsPattern::FromURLNoWildcard(requesting_origin),
       ContentSettingsPattern::FromURLNoWildcard(embedder_origin),
       permission_type_,
       std::string(),
       content_setting);
 }