Revert "ambient: Use different backend servers"

This reverts commit c8d093a. Reason for revert: Test failures on ChromeOS https://ci.chromium.org/p/chrome/builders/ci/linux-chromeos-chrome/7829 Original change's description: > ambient: Use different backend servers > > This patch configs the dev channel to use testing server. But users can > overwrite it with a flag. > > Bug: b/148692733 > Test: manual > Change-Id: I967281bc1421c37d9c1ff74a0815d6a6da570da3 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2342134 > Commit-Queue: Tao Wu <wutao@chromium.org> > Reviewed-by: Xiyuan Xia <xiyuan@chromium.org> > Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org> > Cr-Commit-Position: refs/heads/master@{#799318} TBR=xiyuan@chromium.org,xiaohuic@chromium.org,wutao@chromium.org Change-Id: Ic364ef7c1f701b7a36b6503e8d330995de5dcecb No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: b/148692733 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2363508 Reviewed-by: Hajime Hoshi <hajimehoshi@chromium.org> Commit-Queue: Hajime Hoshi <hajimehoshi@chromium.org> Cr-Commit-Position: refs/heads/master@{#799491}
marcosholgado · Aug 19, 2020 · 8fb6951 · 8fb6951
1 parent e384305
commit 8fb6951
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 42 deletions.
diff --git a/ash/ambient/backdrop/ambient_backend_controller_impl.cc b/ash/ambient/backdrop/ambient_backend_controller_impl.cc
@@ -218,10 +218,7 @@ class BackdropURLLoader {
   scoped_refptr<network::SharedURLLoaderFactory> loader_factory_;
 };
 
-AmbientBackendControllerImpl::AmbientBackendControllerImpl()
-    : backdrop_client_config_(ash::AmbientClient::Get()->ShouldUseProdServer()
-                                  ? BackdropClientConfig::ServerType::kProd
-                                  : BackdropClientConfig::ServerType::kDev) {}
+AmbientBackendControllerImpl::AmbientBackendControllerImpl() = default;
 
 AmbientBackendControllerImpl::~AmbientBackendControllerImpl() = default;
 

diff --git a/ash/public/cpp/ambient/ambient_client.h b/ash/public/cpp/ambient/ambient_client.h
@@ -49,9 +49,6 @@ class ASH_PUBLIC_EXPORT AmbientClient {
   virtual void RequestWakeLockProvider(
       mojo::PendingReceiver<device::mojom::WakeLockProvider> receiver) = 0;
 
-  // Whether to use backend production server.
-  virtual bool ShouldUseProdServer() = 0;
-
  protected:
   AmbientClient();
   AmbientClient(const AmbientClient&) = delete;

diff --git a/ash/public/cpp/test/test_ambient_client.cc b/ash/public/cpp/test/test_ambient_client.cc
@@ -62,10 +62,6 @@ void TestAmbientClient::IssueAccessToken(const std::string& access_token,
   }
 }
 
-bool TestAmbientClient::ShouldUseProdServer() {
-  return false;
-}
-
 bool TestAmbientClient::IsAccessTokenRequestPending() const {
   return !!pending_callback_;
 }

diff --git a/ash/public/cpp/test/test_ambient_client.h b/ash/public/cpp/test/test_ambient_client.h
@@ -27,7 +27,6 @@ class ASH_PUBLIC_EXPORT TestAmbientClient : public AmbientClient {
   scoped_refptr<network::SharedURLLoaderFactory> GetURLLoaderFactory() override;
   void RequestWakeLockProvider(
       mojo::PendingReceiver<device::mojom::WakeLockProvider> receiver) override;
-  bool ShouldUseProdServer() override;
 
   // Simulate to issue an |access_token|.
   // If |with_error| is true, will return an empty access token.

diff --git a/chrome/browser/ui/ash/ambient/ambient_client_impl.cc b/chrome/browser/ui/ash/ambient/ambient_client_impl.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/identity_manager_factory.h"
-#include "chrome/common/channel_info.h"
 #include "chromeos/constants/chromeos_features.h"
 #include "components/account_id/account_id.h"
 #include "components/prefs/pref_service.h"
@@ -24,7 +23,6 @@
 #include "components/signin/public/identity_manager/scope_set.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
-#include "components/version_info/channel.h"
 #include "content/public/browser/device_service.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/google_service_auth_error.h"
@@ -166,12 +164,3 @@ void AmbientClientImpl::GetAccessToken(
                             /*expiration_time=*/base::Time::Now());
   }
 }
-
-bool AmbientClientImpl::ShouldUseProdServer() {
-  if (chromeos::features::IsAmbientModeDevUseProdEnabled())
-    return true;
-
-  auto channel = chrome::GetChannel();
-  return channel == version_info::Channel::STABLE ||
-         channel == version_info::Channel::BETA;
-}
diff --git a/chrome/browser/ui/ash/ambient/ambient_client_impl.h b/chrome/browser/ui/ash/ambient/ambient_client_impl.h
@@ -30,7 +30,6 @@ class AmbientClientImpl : public ash::AmbientClient {
   scoped_refptr<network::SharedURLLoaderFactory> GetURLLoaderFactory() override;
   void RequestWakeLockProvider(
       mojo::PendingReceiver<device::mojom::WakeLockProvider> receiver) override;
-  bool ShouldUseProdServer() override;
 
  private:
   void GetAccessToken(GetAccessTokenCallback callback,

diff --git a/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc
@@ -119,10 +119,6 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
   cast_config_controller_media_router_ =
       std::make_unique<CastConfigControllerMediaRouter>();
 
-  // Needed by AmbientController in ash.
-  if (chromeos::features::IsAmbientModeEnabled())
-    ambient_client_ = std::make_unique<AmbientClientImpl>();
-
   ash_shell_init_ = std::make_unique<AshShellInit>();
 
   screen_orientation_delegate_ =
@@ -211,6 +207,9 @@ void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {
 
 void ChromeBrowserMainExtraPartsAsh::PostBrowserStart() {
   mobile_data_notifications_ = std::make_unique<MobileDataNotifications>();
+
+  if (chromeos::features::IsAmbientModeEnabled())
+    ambient_client_ = std::make_unique<AmbientClientImpl>();
 }
 
 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
@@ -220,6 +219,9 @@ void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
   exo_parts_.reset();
 #endif
 
+  if (chromeos::features::IsAmbientModeEnabled())
+    ambient_client_.reset();
+
   night_light_client_.reset();
   mobile_data_notifications_.reset();
   chrome_launcher_controller_initializer_.reset();
@@ -244,8 +246,6 @@ void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
   // needs to be released before destroying the profile.
   app_list_client_.reset();
   ash_shell_init_.reset();
-  ambient_client_.reset();
-
   cast_config_controller_media_router_.reset();
   if (chromeos::NetworkConnect::IsInitialized())
     chromeos::NetworkConnect::Shutdown();

diff --git a/chromeos/constants/chromeos_features.cc b/chromeos/constants/chromeos_features.cc
@@ -29,11 +29,6 @@ const base::Feature kAmbientModeFeature{"ChromeOSAmbientMode",
 const base::Feature kAmbientModePhotoPreviewFeature{
     "ChromeOSAmbientModePhotoPreview", base::FEATURE_DISABLED_BY_DEFAULT};
 
-// Controls whether to allow Dev channel to use Prod server feature.
-const base::Feature kAmbientModeDevUseProdFeature{
-    "ChromeOSAmbientModeDevChannelUseProdServer",
-    base::FEATURE_DISABLED_BY_DEFAULT};
-
 // Controls whether to enable ARC ADB sideloading support.
 const base::Feature kArcAdbSideloadingFeature{
     "ArcAdbSideloading", base::FEATURE_DISABLED_BY_DEFAULT};
@@ -539,10 +534,6 @@ bool IsAmbientModePhotoPreviewEnabled() {
   return base::FeatureList::IsEnabled(kAmbientModePhotoPreviewFeature);
 }
 
-bool IsAmbientModeDevUseProdEnabled() {
-  return base::FeatureList::IsEnabled(kAmbientModeDevUseProdFeature);
-}
-
 bool IsBetterUpdateEnabled() {
   return base::FeatureList::IsEnabled(kBetterUpdateScreen);
 }

diff --git a/chromeos/constants/chromeos_features.h b/chromeos/constants/chromeos_features.h
@@ -22,8 +22,6 @@ extern const base::Feature kAmbientModeFeature;
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
 extern const base::Feature kAmbientModePhotoPreviewFeature;
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
-extern const base::Feature kAmbientModeDevUseProdFeature;
-COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
 extern const base::Feature kArcAdbSideloadingFeature;
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
 extern const base::Feature kArcManagedAdbSideloadingSupport;
@@ -234,7 +232,6 @@ extern const base::Feature kImeMozcProto;
 
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsAmbientModeEnabled();
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsAmbientModePhotoPreviewEnabled();
-COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsAmbientModeDevUseProdEnabled();
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsAssistantEnabled();
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsBetterUpdateEnabled();
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsChildSpecificSigninEnabled();