Group the different permission related methods in the content api.

content/shell/browser/layout_test/layout_test_content_browser_client.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 "content/shell/browser/layout_test/layout_test_content_browser_client.h"
 
 #include "content/public/browser/browser_thread.h"
 #include "content/shell/browser/layout_test/layout_test_notification_manager.h"
 
 namespace content {
 namespace {
 
 LayoutTestContentBrowserClient* g_layout_test_browser_client;
 
-void RequestDesktopNotificationPermissionOnIO(
-    const GURL& source_origin,
-    RenderFrameHost* render_frame_host,
-    const base::Callback<void(blink::WebNotificationPermission)>& callback) {
-  LayoutTestNotificationManager* manager =
-      LayoutTestContentBrowserClient::Get()->GetLayoutTestNotificationManager();
-  if (manager)
-    manager->RequestPermission(source_origin, callback);

[Peter Beverloo, 2014/10/20 17:32:16]

Removing this is not OK and will break tests.

In order to properly test Web Exposed behavior, layout tests need a way to
control whether permission is granted or not. This code is part of that (there
is more, but c/s/b/ is being refactored quite heavily right now). It defers the
RequestPermission call to a "fake" LayoutTestNotificationManager instead.

[Miguel Garcia, 2014/10/21 17:17:12]

Fixed now

On 2014/10/20 17:32:16, Peter Beverloo wrote:

-  else
-    callback.Run(blink::WebNotificationPermissionAllowed);
-}
-
 }  // namespace
 
 LayoutTestContentBrowserClient::LayoutTestContentBrowserClient() {
   DCHECK(!g_layout_test_browser_client);
   g_layout_test_browser_client = this;
 }
 
 LayoutTestContentBrowserClient::~LayoutTestContentBrowserClient() {
   g_layout_test_browser_client = nullptr;
 }
 
 LayoutTestContentBrowserClient* LayoutTestContentBrowserClient::Get() {
   return g_layout_test_browser_client;
 }
 
 LayoutTestNotificationManager*
 LayoutTestContentBrowserClient::GetLayoutTestNotificationManager() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!layout_test_notification_manager_) {
     layout_test_notification_manager_.reset(
         new LayoutTestNotificationManager());
   }
 
   return layout_test_notification_manager_.get();
 }
 
-void LayoutTestContentBrowserClient::RequestDesktopNotificationPermission(
-    const GURL& source_origin,
-    RenderFrameHost* render_frame_host,
-    const base::Callback<void(blink::WebNotificationPermission)>& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  BrowserThread::PostTask(BrowserThread::IO,
-                          FROM_HERE,
-                          base::Bind(&RequestDesktopNotificationPermissionOnIO,
-                                     source_origin,
-                                     render_frame_host,
-                                     callback));
-}
-
 blink::WebNotificationPermission
 LayoutTestContentBrowserClient::CheckDesktopNotificationPermission(
     const GURL& source_url,
     ResourceContext* context,
     int render_process_id) {
   LayoutTestNotificationManager* manager = GetLayoutTestNotificationManager();
   if (manager)
     return manager->CheckPermission(source_url);
 
   return blink::WebNotificationPermissionAllowed;
 }
 
 }  // namespace content