Merge //content/child/permissions into Blink's permissions module.

content/child/blink_platform_impl.h

 // 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.
 
 #ifndef CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_
 #define CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 27 matching lines @@
 }
 
 namespace scheduler {
 class WebThreadBase;
 }
 
 namespace content {
 class BackgroundSyncProvider;
 class FlingCurveConfiguration;
 class NotificationDispatcher;
-class PermissionDispatcher;
 class PushDispatcher;
 class ThreadSafeSender;
 class TraceLogObserverAdapter;
 class WebCryptoImpl;
 
 class CONTENT_EXPORT BlinkPlatformImpl
     : NON_EXPORTED_BASE(public blink::Platform) {
  public:
   BlinkPlatformImpl();
   explicit BlinkPlatformImpl(
@@ skipping 61 matching lines @@
       blink::WebGestureDevice device_source,
       const blink::WebFloatPoint& velocity,
       const blink::WebSize& cumulative_scroll) override;
   void didStartWorkerThread() override;
   void willStopWorkerThread() override;
   bool allowScriptExtensionForServiceWorker(
       const blink::WebURL& script_url) override;
   blink::WebCrypto* crypto() override;
   blink::WebNotificationManager* notificationManager() override;
   blink::WebPushProvider* pushProvider() override;
-  blink::WebPermissionClient* permissionClient() override;
   blink::WebSyncProvider* backgroundSyncProvider() override;
 
   blink::WebString domCodeStringFromEnum(int dom_code) override;
   int domEnumFromCodeString(const blink::WebString& codeString) override;
   blink::WebString domKeyStringFromEnum(int dom_key) override;
   int domKeyEnumFromString(const blink::WebString& key_string) override;
 
   // This class does *not* own the compositor thread. It is the responsibility
   // of the caller to ensure that the compositor thread is cleared before it is
   // destructed.
@@ skipping 11 matching lines @@
   WebFallbackThemeEngineImpl fallback_theme_engine_;
   base::ThreadLocalStorage::Slot current_thread_slot_;
   webcrypto::WebCryptoImpl web_crypto_;
   base::ScopedPtrHashMap<blink::Platform::TraceLogEnabledStateObserver*,
                          std::unique_ptr<TraceLogObserverAdapter>>
       trace_log_observers_;
 
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
   scoped_refptr<NotificationDispatcher> notification_dispatcher_;
   scoped_refptr<PushDispatcher> push_dispatcher_;
-  std::unique_ptr<PermissionDispatcher> permission_client_;
   std::unique_ptr<BackgroundSyncProvider> main_thread_sync_provider_;
 
   scheduler::WebThreadBase* compositor_thread_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_