Re-enable LocalSyncTest.ShouldStart for branded builds

- Disable check for SharingService instead, which only applies when
  kSharingDeriveVapidKey is enabled by field trial config, which is
  never the case for branded builds.

Bug: 1028113
Change-Id: I1b9368692ffe3bcf8e2c6cfc4fa8ad4d51867ed1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1942435Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Commit-Queue: Alex Chau <alexchau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720016}

chrome/browser/sync/test/integration/local_sync_test.cc

@@ -67,8 +67,7 @@ class LocalSyncTest : public InProcessBrowserTest {
 };
 
 // The local sync backend is currently only supported on Windows.
-// TODO(crbug.com/1028113) Fix in Chrome-branded builds.
-#if defined(OS_WIN) && !BUILDFLAG(GOOGLE_CHROME_BRANDING)
+#if defined(OS_WIN)
 IN_PROC_BROWSER_TEST_F(LocalSyncTest, ShouldStart) {
   ProfileSyncService* service =
       ProfileSyncServiceFactory::GetAsProfileSyncServiceForProfile(
@@ -82,10 +81,15 @@ IN_PROC_BROWSER_TEST_F(LocalSyncTest, ShouldStart) {
 
   // Verify certain features are disabled.
   EXPECT_FALSE(send_tab_to_self::IsUserSyncTypeActive(browser()->profile()));
+
+#if !BUILDFLAG(GOOGLE_CHROME_BRANDING)
+  // SharingService is only disabled if kSharingDeriveVapidKey is enabled by
+  // field trial config, which is never the case for branded builds.
   EXPECT_EQ(SharingService::State::DISABLED,
             SharingServiceFactory::GetForBrowserContext(browser()->profile())
                 ->GetStateForTesting());
+#endif  // !BUILDFLAG(GOOGLE_CHROME_BRANDING)
 }
-#endif  // defined(OS_WIN) && !BUILDFLAG(GOOGLE_CHROME_BRANDING)
+#endif  // defined(OS_WIN)
 
 }  // namespace