Remove custom push servcie endpoint support

Task-number: QTBUG-107442
Change-Id: Iaba5a6620fcc71f04f87da47e72261e7c477ea19
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/449005
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 0 insertions, 25 deletions

diff --git a/chromium/chrome/browser/profiles/profile.cc b/chromium/chrome/browser/profiles/profile.cc
index 6d389075eec..ea65fcc2179 100644
--- a/chromium/chrome/browser/profiles/profile.cc
+++ b/chromium/chrome/browser/profiles/profile.cc
@@ -46,9 +46,3 @@ bool Profile::IsSystemProfile() const {
   return profile_metrics::GetBrowserProfileType(this) ==
          profile_metrics::BrowserProfileType::kSystem;
 }
-
-#ifdef TOOLKIT_QT
-std::string Profile::GetPushMessagingEndpoint() const {
-  return "";
-}
-#endif
diff --git a/chromium/chrome/browser/profiles/profile.h b/chromium/chrome/browser/profiles/profile.h
index cb0057570ee..46d5f28cbd8 100644
--- a/chromium/chrome/browser/profiles/profile.h
+++ b/chromium/chrome/browser/profiles/profile.h
@@ -50,9 +50,6 @@ class Profile : public content::BrowserContext {
   // off-the-record profiles of a Guest session.
   virtual bool IsGuestSession() const;
 
-#ifdef TOOLKIT_QT
-  virtual std::string GetPushMessagingEndpoint() const;
-#endif
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_H_
diff --git a/chromium/chrome/browser/push_messaging/push_messaging_service_impl.cc b/chromium/chrome/browser/push_messaging/push_messaging_service_impl.cc
index 1bb7784d40c..44d9c62c829 100644
--- a/chromium/chrome/browser/push_messaging/push_messaging_service_impl.cc
+++ b/chromium/chrome/browser/push_messaging/push_messaging_service_impl.cc
@@ -94,14 +94,6 @@ using instance_id::InstanceID;
 
 namespace {
 
-#ifdef TOOLKIT_QT
-GURL CreateCustomEndpoint(Profile *profile, const std::string& subscription_id) {
-  const GURL endpoint(profile->GetPushMessagingEndpoint() + subscription_id);
-  DCHECK(endpoint.is_valid());
-  return endpoint;
-}
-#endif
-
 // Scope passed to getToken to obtain GCM registration tokens.
 // Must match Java GoogleCloudMessaging.INSTANCE_ID_SCOPE.
 const char kGCMScope[] = "GCM";
@@ -1162,11 +1154,7 @@ void PushMessagingServiceImpl::DidSubscribe(
 
   switch (result) {
     case InstanceID::SUCCESS: {
-#ifndef TOOLKIT_QT
       const GURL endpoint = push_messaging::CreateEndpoint(subscription_id);
-#else
-      const GURL endpoint = CreateCustomEndpoint(profile_, subscription_id);
-#endif
 
       // Make sure that this subscription has associated encryption keys prior
       // to returning it to the developer - they'll need this information in
@@ -1241,11 +1229,7 @@ void PushMessagingServiceImpl::GetSubscriptionInfo(
     return;
   }
 
-#ifndef TOOLKIT_QT
   const GURL endpoint = push_messaging::CreateEndpoint(subscription_id);
-#else
-  const GURL endpoint = CreateCustomEndpoint(profile_, subscription_id);
-#endif
 
   const std::string& app_id = app_identifier.app_id();
   absl::optional<base::Time> expiration_time = app_identifier.expiration_time();