Show Click to Call dialog if sync is disabled.

We want to show the Click to Call dialog even if sync is disabled to
show the user some help text on how to enable sync.

Bug: 986273
Change-Id: I5f920822f21761ee5f167af0622b11304140cda4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1713533Reviewed-by: Michael van Ouwerkerk <mvanouwerkerk@chromium.org>
Commit-Queue: Richard Knoll <knollr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680351}

chrome/browser/sharing/click_to_call/click_to_call_utils.cc

@@ -15,7 +15,6 @@ bool ShouldOfferClickToCall(content::BrowserContext* browser_context,
   SharingService* sharing_service =
       SharingServiceFactory::GetForBrowserContext(browser_context);
   return sharing_service &&
-         (sharing_service->GetState() == SharingService::State::ACTIVE) &&
          base::FeatureList::IsEnabled(kClickToCallUI) &&
          url.SchemeIs(url::kTelScheme) && !url.GetContent().empty();
 }

chrome/browser/sharing/click_to_call/click_to_call_utils_unittest.cc

@@ -64,22 +64,24 @@ class ClickToCallUtilsTest : public testing::Test {
 
   void SetUp() override {
     SharingServiceFactory::GetInstance()->SetTestingFactory(
-        &profile_, base::BindRepeating([](content::BrowserContext* context)
-                                           -> std::unique_ptr<KeyedService> {
-          return std::make_unique<NiceMock<MockSharingService>>(
-              std::make_unique<SharingFCMHandler>(nullptr, nullptr));
-        }));
+        &profile_, base::BindRepeating(&ClickToCallUtilsTest::CreateService,
+                                       base::Unretained(this)));
   }
 
  protected:
-  NiceMock<MockSharingService>* service() {
-    return static_cast<NiceMock<MockSharingService>*>(
-        SharingServiceFactory::GetForBrowserContext(&profile_));
+  std::unique_ptr<KeyedService> CreateService(
+      content::BrowserContext* context) {
+    if (!create_service_)
+      return nullptr;
+
+    return std::make_unique<NiceMock<MockSharingService>>(
+        std::make_unique<SharingFCMHandler>(nullptr, nullptr));
   }
 
   base::test::ScopedFeatureList scoped_feature_list_;
   content::TestBrowserThreadBundle thread_bundle_;
   TestingProfile profile_;
+  bool create_service_ = true;
 
   DISALLOW_COPY_AND_ASSIGN(ClickToCallUtilsTest);
 };
@@ -88,17 +90,11 @@ class ClickToCallUtilsTest : public testing::Test {
 
 TEST_F(ClickToCallUtilsTest, NonTelProtocol_DoNotShowMenu) {
   scoped_feature_list_.InitAndEnableFeature(kClickToCallUI);
-  EXPECT_CALL(*service(), GetState())
-      .WillOnce(Return(SharingService::State::ACTIVE));
-
   EXPECT_FALSE(ShouldOfferClickToCall(&profile_, GURL(kNonTelUrl)));
 }
 
 TEST_F(ClickToCallUtilsTest, UIFlagDisabled_DoNotShowMenu) {
   scoped_feature_list_.InitAndDisableFeature(kClickToCallUI);
-  EXPECT_CALL(*service(), GetState())
-      .WillOnce(Return(SharingService::State::ACTIVE));
-
   EXPECT_FALSE(ShouldOfferClickToCall(&profile_, GURL(kTelUrl)));
 }
 
@@ -112,16 +108,16 @@ TEST_F(ClickToCallUtilsTest, IncognitoProfile_DoNotShowMenu) {
 
 TEST_F(ClickToCallUtilsTest, EmptyTelProtocol_DoNotShowMenu) {
   scoped_feature_list_.InitAndEnableFeature(kClickToCallUI);
-  EXPECT_CALL(*service(), GetState())
-      .WillOnce(Return(SharingService::State::ACTIVE));
-
   EXPECT_FALSE(ShouldOfferClickToCall(&profile_, GURL(kEmptyTelUrl)));
 }
 
 TEST_F(ClickToCallUtilsTest, TelProtocol_ShowMenu) {
   scoped_feature_list_.InitAndEnableFeature(kClickToCallUI);
-  EXPECT_CALL(*service(), GetState())
-      .WillOnce(Return(SharingService::State::ACTIVE));
-
   EXPECT_TRUE(ShouldOfferClickToCall(&profile_, GURL(kTelUrl)));
 }
+
+TEST_F(ClickToCallUtilsTest, NoSharingService_DoNotShowMenu) {
+  scoped_feature_list_.InitAndEnableFeature(kClickToCallUI);
+  create_service_ = false;
+  EXPECT_FALSE(ShouldOfferClickToCall(&profile_, GURL(kTelUrl)));
+}

chrome/browser/sharing/sharing_service.cc

@@ -93,6 +93,9 @@ SharingService::~SharingService() {
 
 std::vector<SharingDeviceInfo> SharingService::GetDeviceCandidates(
     int required_capabilities) const {
+  if (!IsSyncEnabled())
+    return std::vector<SharingDeviceInfo>();
+
   std::vector<std::unique_ptr<syncer::DeviceInfo>> all_devices =
       device_info_tracker_->GetAllDeviceInfo();
   std::map<std::string, SharingSyncPreference::Device> synced_devices =

chrome/browser/sharing/sharing_service_unittest.cc

@@ -591,3 +591,20 @@ TEST_F(SharingServiceTest, StartListeningToFCMAtConstructor) {
   EXPECT_CALL(*fcm_handler_, StartListening()).Times(1);
   GetSharingService();
 }
+
+TEST_F(SharingServiceTest, NoDevicesWhenSyncDisabled) {
+  scoped_feature_list_.InitAndEnableFeature(kSharingDeviceRegistration);
+  test_sync_service_.SetTransportState(
+      syncer::SyncService::TransportState::DISABLED);
+
+  std::string id = base::GenerateGUID();
+  std::unique_ptr<syncer::DeviceInfo> device_info =
+      CreateFakeDeviceInfo(id, kDeviceName);
+  device_info_tracker_.Add(device_info.get());
+  sync_prefs_->SetSyncDevice(id, CreateFakeSyncDevice());
+
+  std::vector<SharingDeviceInfo> candidates =
+      GetSharingService()->GetDeviceCandidates(kNoCapabilities);
+
+  ASSERT_EQ(0u, candidates.size());
+}