ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool.

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_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/shell/browser/layout_test/layout_test_browser_context.h"
 #include "content/shell/browser/layout_test/layout_test_message_filter.h"
 #include "content/shell/browser/layout_test/layout_test_notification_manager.h"
 #include "content/shell/browser/shell_browser_context.h"
 #include "content/shell/common/shell_messages.h"
 #include "content/shell/common/webkit_test_helpers.h"
 
 namespace content {
 namespace {
 
 LayoutTestContentBrowserClient* g_layout_test_browser_client;
 
 void RequestDesktopNotificationPermissionOnIO(
     const GURL& source_origin,
-    const base::Callback<void(bool)>& callback) {
+    const base::Callback<void(PermissionStatus)>& callback) {
   LayoutTestNotificationManager* manager =
       LayoutTestContentBrowserClient::Get()->GetLayoutTestNotificationManager();
   bool allowed = manager ? manager->RequestPermission(source_origin)
                          : true;
 
   // The callback came from the UI thread, we need to run it from there again.
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
-      base::Bind(callback, allowed));
+      base::Bind(callback,
+                 allowed ? PERMISSION_STATUS_GRANTED : PERMISSION_STATUS_ASK));
 }
 
 }  // namespace
 
 LayoutTestContentBrowserClient::LayoutTestContentBrowserClient() {
   DCHECK(!g_layout_test_browser_client);
 
   layout_test_notification_manager_.reset(new LayoutTestNotificationManager());
 
   g_layout_test_browser_client = this;
@@ skipping 31 matching lines @@
 
   host->Send(new ShellViewMsg_SetWebKitSourceDir(GetWebKitRootDirFilePath()));
 }
 
 void LayoutTestContentBrowserClient::RequestPermission(
     PermissionType permission,
     WebContents* web_contents,
     int bridge_id,
     const GURL& requesting_frame,
     bool user_gesture,
-    const base::Callback<void(bool)>& result_callback) {
+    const base::Callback<void(PermissionStatus)>& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (permission == content::PERMISSION_NOTIFICATIONS) {
     BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(&RequestDesktopNotificationPermissionOnIO,
                    requesting_frame,
-                   result_callback));
+                   callback));
     return;
   }
   ShellContentBrowserClient::RequestPermission(permission,
                                                web_contents,
                                                bridge_id,
                                                requesting_frame,
                                                user_gesture,
-                                               result_callback);
+                                               callback);
 }
 
 PlatformNotificationService*
 LayoutTestContentBrowserClient::GetPlatformNotificationService() {
   return layout_test_notification_manager_.get();
 }
 
 }  // namespace content