Move geolocation and permission mojoms into WebKit/public/platform.

chrome/browser/push_messaging/push_messaging_service_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 CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_
 #define CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_
 
 #include <stdint.h>
 #include <set>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/background/background_trigger.h"
 #include "components/content_settings/core/browser/content_settings_observer.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/gcm_driver/common/gcm_messages.h"
 #include "components/gcm_driver/gcm_app_handler.h"
 #include "components/gcm_driver/gcm_client.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/push_messaging_service.h"
-#include "content/public/common/permission_status.mojom.h"
 #include "content/public/common/push_event_payload.h"
 #include "content/public/common/push_messaging_status.h"
+#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushPermissionStatus.h"
 
 #if defined(ENABLE_NOTIFICATIONS)
 #include "chrome/browser/push_messaging/push_messaging_notification_manager.h"
 #endif
 
 class Profile;
 class PushMessagingAppIdentifier;
 class PushMessagingServiceObserver;
 struct PushSubscriptionOptions;
@@ skipping 120 matching lines @@
       const PushMessagingAppIdentifier& app_identifier,
       const content::PushMessagingService::RegisterCallback& callback,
       const std::string& subscription_id,
       const std::string& p256dh,
       const std::string& auth_secret);
 
   void DidRequestPermission(
       const PushMessagingAppIdentifier& app_identifier,
       const content::PushSubscriptionOptions& options,
       const content::PushMessagingService::RegisterCallback& callback,
-      content::mojom::PermissionStatus permission_status);
+      blink::mojom::PermissionStatus permission_status);
 
   // GetEncryptionInfo method --------------------------------------------------
 
   void DidGetEncryptionInfo(
       const PushMessagingService::EncryptionInfoCallback& callback,
       const std::string& p256dh,
       const std::string& auth_secret) const;
 
   // Unsubscribe methods -------------------------------------------------------
 
@@ skipping 55 matching lines @@
   MessageDispatchedCallback message_dispatched_callback_for_testing_;
 
   scoped_ptr<PushMessagingServiceObserver> push_messaging_service_observer_;
 
   base::WeakPtrFactory<PushMessagingServiceImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PushMessagingServiceImpl);
 };
 
 #endif  // CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_