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 275 matching lines @@
   delete this;
 }
 
 PermissionRequestType
 MediaStreamDevicesController::Request::GetPermissionRequestType() const {
   return PermissionRequestType::MEDIA_STREAM;
 }
 
 bool MediaStreamDevicesController::Request::ShouldShowPersistenceToggle()
     const {
-  return PermissionUtil::ShouldShowPersistenceToggle();
+  // Camera and Mic are handled the same w.r.t. showing the persistence toggle,
+  // just check camera here for simplicity (this class will be removed once the
+  // Android and media refactorings are finished).
+  return PermissionUtil::ShouldShowPersistenceToggle(
+      CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
 }
 
 // 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;
 }