Unified BraveVpnServiceDesktop into BraveVpnService

No functional changes. It's preparation for sharing the purchased state managing logic on Desktop and Android.
brave · Feb 15, 2022 · 641de45 · 641de45
1 parent 27a3811
commit 641de45
Show file tree

Hide file tree

Showing 22 changed files with 1,227 additions and 1,282 deletions.
diff --git a/browser/brave_vpn/brave_vpn_service_factory.cc b/browser/brave_vpn/brave_vpn_service_factory.cc
@@ -16,16 +16,7 @@
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/storage_partition.h"
 
-// TODO(bsclifton) or TODO(shong):
-// We should be able to consolidate this integration into one implementation
-// which we can share between Android and Desktop.
-//
-// As seen below, Desktop returns BraveVpnServiceDesktop and Android
-// returns BraveVpnService.
-//
-// See https://github.com/brave/brave-browser/issues/20374 for more info.
 #if defined(OS_WIN) || defined(OS_MAC)
-#include "brave/components/brave_vpn/brave_vpn_service_desktop.h"
 #include "brave/components/brave_vpn/brave_vpn_utils.h"
 #endif
 
@@ -35,24 +26,11 @@ BraveVpnServiceFactory* BraveVpnServiceFactory::GetInstance() {
 }
 
 // static
-#if defined(OS_WIN) || defined(OS_MAC)
-BraveVpnServiceDesktop* BraveVpnServiceFactory::GetForProfile(
-    Profile* profile) {
-  return static_cast<BraveVpnServiceDesktop*>(
-      GetInstance()->GetServiceForBrowserContext(profile, true));
-}
-#elif defined(OS_ANDROID)
 BraveVpnService* BraveVpnServiceFactory::GetForProfile(Profile* profile) {
   return static_cast<BraveVpnService*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
 }
-#endif
 
-// TODO(bsclifton) or TODO(shong):
-// BraveVpnServiceDesktop is currently only used on Desktop,
-// which is why there are only OS guards for Windows and macOS.
-// Consolidating the Android/Desktop behaviors is captured with:
-// https://github.com/brave/brave-browser/issues/20374
 BraveVpnServiceFactory::BraveVpnServiceFactory()
     : BrowserContextKeyedServiceFactory(
           "BraveVpnService",
@@ -75,15 +53,13 @@ KeyedService* BraveVpnServiceFactory::BuildServiceInstanceFor(
   auto shared_url_loader_factory =
       default_storage_partition->GetURLLoaderFactoryForBrowserProcess();
 
-// TODO(bsclifton) or TODO(shong):
-// see same notes above
 #if defined(OS_WIN) || defined(OS_MAC)
   auto callback = base::BindRepeating(
       [](content::BrowserContext* context) {
         return skus::SkusServiceFactory::GetForContext(context);
       },
       context);
-  return new BraveVpnServiceDesktop(
+  return new BraveVpnService(
       shared_url_loader_factory, user_prefs::UserPrefs::Get(context), callback);
 #elif defined(OS_ANDROID)
   return new BraveVpnService(shared_url_loader_factory);

diff --git a/browser/brave_vpn/brave_vpn_service_factory.h b/browser/brave_vpn/brave_vpn_service_factory.h
@@ -11,25 +11,12 @@
 #include "base/memory/singleton.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 
-class Profile;
-
-#if defined(OS_WIN) || defined(OS_MAC)
-class BraveVpnServiceDesktop;
-#endif
-
-#if defined(OS_ANDROID)
 class BraveVpnService;
-#endif
+class Profile;
 
 class BraveVpnServiceFactory : public BrowserContextKeyedServiceFactory {
  public:
-#if defined(OS_WIN) || defined(OS_MAC)
-  static BraveVpnServiceDesktop* GetForProfile(Profile* profile);
-#endif
-
-#if defined(OS_ANDROID)
   static BraveVpnService* GetForProfile(Profile* profile);
-#endif
   static BraveVpnServiceFactory* GetInstance();
 
   BraveVpnServiceFactory(const BraveVpnServiceFactory&) = delete;

diff --git a/browser/ui/brave_browser_command_controller.cc b/browser/ui/brave_browser_command_controller.cc
@@ -31,7 +31,7 @@
 
 #if BUILDFLAG(ENABLE_BRAVE_VPN)
 #include "brave/browser/brave_vpn/brave_vpn_service_factory.h"
-#include "brave/components/brave_vpn/brave_vpn_service_desktop.h"
+#include "brave/components/brave_vpn/brave_vpn_service.h"
 #include "brave/components/brave_vpn/brave_vpn_utils.h"
 #endif
 

diff --git a/browser/ui/brave_browser_command_controller_browsertest.cc b/browser/ui/brave_browser_command_controller_browsertest.cc
@@ -31,7 +31,7 @@
 
 #if BUILDFLAG(ENABLE_BRAVE_VPN)
 #include "brave/browser/brave_vpn/brave_vpn_service_factory.h"
-#include "brave/components/brave_vpn/brave_vpn_service_desktop.h"
+#include "brave/components/brave_vpn/brave_vpn_service.h"
 #include "brave/components/brave_vpn/features.h"
 #endif
 

diff --git a/browser/ui/toolbar/brave_app_menu_model_browsertest.cc b/browser/ui/toolbar/brave_app_menu_model_browsertest.cc
@@ -33,7 +33,7 @@
 
 #if BUILDFLAG(ENABLE_BRAVE_VPN)
 #include "brave/browser/brave_vpn/brave_vpn_service_factory.h"
-#include "brave/components/brave_vpn/brave_vpn_service_desktop.h"
+#include "brave/components/brave_vpn/brave_vpn_service.h"
 #include "brave/components/brave_vpn/features.h"
 #endif
 

diff --git a/browser/ui/views/toolbar/brave_vpn_button.cc b/browser/ui/views/toolbar/brave_vpn_button.cc
@@ -13,7 +13,7 @@
 #include "brave/app/vector_icons/vector_icons.h"
 #include "brave/browser/brave_vpn/brave_vpn_service_factory.h"
 #include "brave/browser/themes/theme_properties.h"
-#include "brave/components/brave_vpn/brave_vpn_service_desktop.h"
+#include "brave/components/brave_vpn/brave_vpn_service.h"
 #include "brave/grit/brave_generated_resources.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser.h"

diff --git a/browser/ui/views/toolbar/brave_vpn_button.h b/browser/ui/views/toolbar/brave_vpn_button.h
@@ -10,7 +10,7 @@
 #include "chrome/browser/ui/views/toolbar/toolbar_button.h"
 #include "ui/base/metadata/metadata_header_macros.h"
 
-class BraveVpnServiceDesktop;
+class BraveVpnService;
 class Browser;
 
 class BraveVPNButton : public ToolbarButton, public BraveVPNServiceObserver {
@@ -37,7 +37,7 @@ class BraveVPNButton : public ToolbarButton, public BraveVPNServiceObserver {
   void OnButtonPressed(const ui::Event& event);
 
   Browser* browser_ = nullptr;
-  BraveVpnServiceDesktop* service_ = nullptr;
+  BraveVpnService* service_ = nullptr;
 };
 
 #endif  // BRAVE_BROWSER_UI_VIEWS_TOOLBAR_BRAVE_VPN_BUTTON_H_
diff --git a/browser/ui/views/toolbar/brave_vpn_status_label.cc b/browser/ui/views/toolbar/brave_vpn_status_label.cc
@@ -9,7 +9,7 @@
 
 #include "brave/browser/brave_vpn/brave_vpn_service_factory.h"
 #include "brave/browser/themes/theme_properties.h"
-#include "brave/components/brave_vpn/brave_vpn_service_desktop.h"
+#include "brave/components/brave_vpn/brave_vpn_service.h"
 #include "brave/grit/brave_generated_resources.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"

diff --git a/browser/ui/views/toolbar/brave_vpn_status_label.h b/browser/ui/views/toolbar/brave_vpn_status_label.h
@@ -9,7 +9,7 @@
 #include "brave/components/brave_vpn/brave_vpn_service_observer.h"
 #include "ui/views/controls/label.h"
 
-class BraveVpnServiceDesktop;
+class BraveVpnService;
 class Browser;
 
 class BraveVPNStatusLabel : public views::Label,
@@ -29,7 +29,7 @@ class BraveVPNStatusLabel : public views::Label,
   void UpdateState();
 
   Browser* browser_ = nullptr;
-  BraveVpnServiceDesktop* service_ = nullptr;
+  BraveVpnService* service_ = nullptr;
 };
 
 #endif  // BRAVE_BROWSER_UI_VIEWS_TOOLBAR_BRAVE_VPN_STATUS_LABEL_H_
diff --git a/browser/ui/views/toolbar/brave_vpn_toggle_button.cc b/browser/ui/views/toolbar/brave_vpn_toggle_button.cc
@@ -10,7 +10,7 @@
 #include "base/bind.h"
 #include "brave/browser/brave_vpn/brave_vpn_service_factory.h"
 #include "brave/browser/themes/theme_properties.h"
-#include "brave/components/brave_vpn/brave_vpn_service_desktop.h"
+#include "brave/components/brave_vpn/brave_vpn_service.h"
 #include "brave/grit/brave_generated_resources.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"

diff --git a/browser/ui/views/toolbar/brave_vpn_toggle_button.h b/browser/ui/views/toolbar/brave_vpn_toggle_button.h
@@ -9,7 +9,7 @@
 #include "brave/components/brave_vpn/brave_vpn_service_observer.h"
 #include "ui/views/controls/button/toggle_button.h"
 
-class BraveVpnServiceDesktop;
+class BraveVpnService;
 class Browser;
 
 class BraveVPNToggleButton : public views::ToggleButton,
@@ -30,7 +30,7 @@ class BraveVPNToggleButton : public views::ToggleButton,
   void UpdateState();
 
   Browser* browser_ = nullptr;
-  BraveVpnServiceDesktop* service_ = nullptr;
+  BraveVpnService* service_ = nullptr;
 };
 
 #endif  // BRAVE_BROWSER_UI_VIEWS_TOOLBAR_BRAVE_VPN_TOGGLE_BUTTON_H_
diff --git a/browser/ui/webui/brave_vpn/vpn_panel_handler.h b/browser/ui/webui/brave_vpn/vpn_panel_handler.h
@@ -18,8 +18,6 @@ namespace content {
 class WebUI;
 }  // namespace content
 
-class BraveVpnServiceDesktop;
-
 class VPNPanelHandler : public brave_vpn::mojom::PanelHandler {
  public:
   using GetWebContentsForTabCallback =

diff --git a/browser/ui/webui/brave_vpn/vpn_panel_ui.cc b/browser/ui/webui/brave_vpn/vpn_panel_ui.cc
@@ -67,7 +67,7 @@ void VPNPanelUI::CreatePanelHandler(
   panel_handler_ =
       std::make_unique<VPNPanelHandler>(std::move(panel_receiver), this);
 
-  BraveVpnServiceDesktop* vpn_service_desktop =
+  BraveVpnService* vpn_service_desktop =
       BraveVpnServiceFactory::GetForProfile(profile);
   if (vpn_service_desktop) {
     vpn_service_desktop->BindInterface(std::move(vpn_service_receiver));

diff --git a/browser/ui/webui/brave_vpn/vpn_panel_ui.h b/browser/ui/webui/brave_vpn/vpn_panel_ui.h
@@ -10,7 +10,7 @@
 
 #include "brave/browser/ui/webui/brave_vpn/vpn_panel_handler.h"
 #include "brave/components/brave_vpn/brave_vpn.mojom.h"
-#include "brave/components/brave_vpn/brave_vpn_service_desktop.h"
+#include "brave/components/brave_vpn/brave_vpn_service.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"

diff --git a/components/brave_vpn/BUILD.gn b/components/brave_vpn/BUILD.gn
@@ -37,8 +37,6 @@ static_library("brave_vpn") {
       "brave_vpn_os_connection_api.h",
       "brave_vpn_os_connection_api_sim.cc",
       "brave_vpn_os_connection_api_sim.h",
-      "brave_vpn_service_desktop.cc",
-      "brave_vpn_service_desktop.h",
       "brave_vpn_service_observer.cc",
       "brave_vpn_service_observer.h",
       "brave_vpn_utils.cc",