Migrate geolocation permissions to the new common permission class.

extensions/browser/guest_view/web_view/web_view_permission_helper.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 "extensions/browser/guest_view/web_view/web_view_permission_helper.h"
 
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "extensions/browser/api/extensions_api_client.h"
@@ skipping 162 matching lines @@
 
 bool WebViewPermissionHelper::OnMessageReceived(const IPC::Message& message) {
   return web_view_permission_helper_delegate_->OnMessageReceived(message);
 }
 #endif  // defined(ENABLE_PLUGINS)
 
 void WebViewPermissionHelper::RequestMediaAccessPermission(
     content::WebContents* source,
     const content::MediaStreamRequest& request,
     const content::MediaResponseCallback& callback) {
-  base::DictionaryValue request_info;
-  request_info.SetString(guestview::kUrl, request.security_origin.spec());
-  RequestPermission(
-      WEB_VIEW_PERMISSION_TYPE_MEDIA,
-      request_info,
-      base::Bind(&WebViewPermissionHelper::OnMediaPermissionResponse,
-                 weak_factory_.GetWeakPtr(),
-                 request,
-                 callback),
-      false /* allowed_by_default */);
-}
-
-bool WebViewPermissionHelper::CheckMediaAccessPermission(
-    content::WebContents* source,
-    const GURL& security_origin,
-    content::MediaStreamType type) {
-  return web_view_guest()
-      ->embedder_web_contents()
-      ->GetDelegate()
-      ->CheckMediaAccessPermission(
-          web_view_guest()->embedder_web_contents(), security_origin, type);
-}
-
-void WebViewPermissionHelper::OnMediaPermissionResponse(
-    const content::MediaStreamRequest& request,
-    const content::MediaResponseCallback& callback,
-    bool allow,
-    const std::string& user_input) {
-  if (!allow || !web_view_guest()->attached()) {
-    // Deny the request.
-    callback.Run(content::MediaStreamDevices(),
-                 content::MEDIA_DEVICE_INVALID_STATE,
-                 scoped_ptr<content::MediaStreamUI>());
-    return;
-  }
-  if (!web_view_guest()->embedder_web_contents()->GetDelegate())
-    return;
-
-  web_view_guest()
-      ->embedder_web_contents()
-      ->GetDelegate()
-      ->RequestMediaAccessPermission(
-          web_view_guest()->embedder_web_contents(), request, callback);
+  web_view_permission_helper_delegate_-> RequestMediaAccessPermission(

[Bernhard Bauer, 2014/09/19 09:04:24]

No space after "->"

[Miguel Garcia, 2014/09/24 11:04:44]

I reverted this file since it did not belong to this change.

+      source, request, callback);
 }
 
 void WebViewPermissionHelper::CanDownload(
     content::RenderViewHost* render_view_host,
     const GURL& url,
     const std::string& request_method,
     const base::Callback<void(bool)>& callback) {
   web_view_permission_helper_delegate_->CanDownload(
       render_view_host, url, request_method, callback);
 }
@@ skipping 143 matching lines @@
     bool allowed_by_default)
     : callback(callback),
       permission_type(permission_type),
       allowed_by_default(allowed_by_default) {
 }
 
 WebViewPermissionHelper::PermissionResponseInfo::~PermissionResponseInfo() {
 }
 
 }  // namespace extensions