Support persist toggle in PermissionRequestManager path on Android

chrome/browser/media/webrtc/media_stream_devices_controller.cc

 // Copyright (c) 2012 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/webrtc/media_stream_devices_controller.h"
 
 #include <map>
 #include <utility>
 
 #include "base/callback_helpers.h"
@@ skipping 273 matching lines @@
   delete this;
 }
 
 PermissionRequestType
 MediaStreamDevicesController::Request::GetPermissionRequestType() const {
   return PermissionRequestType::MEDIA_STREAM;
 }
 
 bool MediaStreamDevicesController::Request::ShouldShowPersistenceToggle()
     const {
-  return PermissionUtil::ShouldShowPersistenceToggle();
+  if (IsAskingForVideo())
+    return PermissionUtil::ShouldShowPersistenceToggle(
+        CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);

[raymes, 2017/05/30 03:58:58]

nit: {} for multi-line if

+  return PermissionUtil::ShouldShowPersistenceToggle(
+      CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);

[raymes, 2017/05/30 03:58:58]

If we're asking for both mic and camera, should we show the toggle if either of
them are true? I realise that it probably won't matter in practice :P

[Timothy Loh, 2017/05/30 05:52:43]

I changed this to just check CAMERA and added a comment; keeping it simple since
this will be removed once we move to using PermissionRequestImpl for these.

 }
 
 // Implementation of PermissionPromptDelegate which actually shows a permission
 // prompt.
 class MediaStreamDevicesController::PermissionPromptDelegateImpl
     : public MediaStreamDevicesController::PermissionPromptDelegate {
  public:
   void ShowPrompt(
       bool user_gesture,
       content::WebContents* web_contents,
@@ skipping 465 matching lines @@
     }
   }
 
   // Don't approve device requests if the tab was hidden.
   // TODO(qinmin): Add a test for this. http://crbug.com/396869.
   // TODO(raymes): Shouldn't this apply to all permissions not just audio/video?
   return web_contents_->GetRenderWidgetHostView()->IsShowing();
 #endif
   return true;
 }