Commit bce54f67 authored by Hans Wennborg's avatar Hans Wennborg Committed by Commit Bot

Disable sync_integration_tests LocalSyncTest.ShouldStart in Chrome-branded builds

The test doesn't pass in that build config.

TBR=alexchau

Bug: 1028113
Change-Id: I985e84c6971986f66cc3166bd59e26b53a50b8cd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1932552Reviewed-by: default avatarHans Wennborg <hans@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#718681}
parent 138c3d20
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "base/files/scoped_temp_dir.h" #include "base/files/scoped_temp_dir.h"
#include "base/macros.h" #include "base/macros.h"
#include "build/branding_buildflags.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/send_tab_to_self/send_tab_to_self_util.h" #include "chrome/browser/send_tab_to_self/send_tab_to_self_util.h"
...@@ -66,7 +67,8 @@ class LocalSyncTest : public InProcessBrowserTest { ...@@ -66,7 +67,8 @@ class LocalSyncTest : public InProcessBrowserTest {
}; };
// The local sync backend is currently only supported on Windows. // The local sync backend is currently only supported on Windows.
#if defined(OS_WIN) // TODO(crbug.com/1028113) Fix in Chrome-branded builds.
#if defined(OS_WIN) && !BUILDFLAG(GOOGLE_CHROME_BRANDING)
IN_PROC_BROWSER_TEST_F(LocalSyncTest, ShouldStart) { IN_PROC_BROWSER_TEST_F(LocalSyncTest, ShouldStart) {
ProfileSyncService* service = ProfileSyncService* service =
ProfileSyncServiceFactory::GetAsProfileSyncServiceForProfile( ProfileSyncServiceFactory::GetAsProfileSyncServiceForProfile(
...@@ -84,6 +86,6 @@ IN_PROC_BROWSER_TEST_F(LocalSyncTest, ShouldStart) { ...@@ -84,6 +86,6 @@ IN_PROC_BROWSER_TEST_F(LocalSyncTest, ShouldStart) {
SharingServiceFactory::GetForBrowserContext(browser()->profile()) SharingServiceFactory::GetForBrowserContext(browser()->profile())
->GetStateForTesting()); ->GetStateForTesting());
} }
#endif // defined(OS_WIN) #endif // defined(OS_WIN) && !BUILDFLAG(GOOGLE_CHROME_BRANDING)
} // namespace } // namespace
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment