[Media] Add user gesture reporting for API calls to midi and media streams.

chrome/browser/media/chrome_midi_permission_context.cc

 // Copyright 2013 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/media/chrome_midi_permission_context.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/permission_queue_controller.h"
 #include "chrome/browser/content_settings/permission_request_id.h"
@@ skipping 102 matching lines @@
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   permission_queue_controller_.reset();
   shutting_down_ = true;
 }
 
 void ChromeMidiPermissionContext::RequestMidiSysExPermission(
     int render_process_id,
     int render_view_id,
     int bridge_id,
     const GURL& requesting_frame,
+    bool user_gesture,
     const content::BrowserContext::MidiSysExPermissionCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   DCHECK(!shutting_down_);
 
   // TODO(toyoshim): Support Extension's manifest declared permission.
   // See http://crbug.com/266338.
 
   content::WebContents* web_contents =
     tab_util::GetWebContentsByID(render_process_id, render_view_id);
 
   // The page doesn't exist any more.
   if (!web_contents)
     return;
 
   const PermissionRequestID id(render_process_id, render_view_id, bridge_id, 0);
 
   GURL embedder = web_contents->GetURL();
   // |requesting_frame| can be empty and invalid when the frame is a local
   // file. Here local files should be granted to show an infobar.
   // Any user's action will not be stored to content settings data base.
   if ((!requesting_frame.is_valid() && !requesting_frame.is_empty()) ||
       !embedder.is_valid()) {
     LOG(WARNING) << "Attempt to use MIDI sysex from an invalid URL: "
                  << requesting_frame << "," << embedder
                  << " (Web MIDI is not supported in popups)";
     PermissionDecided(id, requesting_frame, embedder, callback, false);
     return;
   }
 
-  DecidePermission(web_contents, id, requesting_frame, embedder, callback);
+  DecidePermission(web_contents, id, requesting_frame, embedder, user_gesture,
+                   callback);
 }
 
 void ChromeMidiPermissionContext::CancelMidiSysExPermissionRequest(
     int render_process_id,
     int render_view_id,
     int bridge_id,
     const GURL& requesting_frame) {
   CancelPendingInfobarRequest(
       PermissionRequestID(render_process_id, render_view_id, bridge_id, 0));
 }
 
 void ChromeMidiPermissionContext::DecidePermission(
     content::WebContents* web_contents,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     const GURL& embedder,
+    bool user_gesture,

[Lei Zhang, 2014/03/12 22:54:08]

Why bother passing it to the internal method if it's not used?

[Greg Billock, 2014/03/24 21:19:42]

The API change went in, so I'll just push it all the way through now.

     const content::BrowserContext::MidiSysExPermissionCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   ContentSetting content_setting =
       profile_->GetHostContentSettingsMap()->GetContentSetting(
           requesting_frame,
           embedder,
           CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
           std::string());
   switch (content_setting) {
@@ skipping 63 matching lines @@
 }
 
 void ChromeMidiPermissionContext::CancelPendingInfobarRequest(
     const PermissionRequestID& id) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (shutting_down_)
     return;
   // TODO(gbillock): Add support for cancellation to permission bubbles.
   GetQueueController()->CancelInfoBarRequest(id);
 }