Revert 256348 "Disabling tests in order to green up the waterfall."

Broke the build:
FAILED: clang++ -MMD -MF obj/chrome/browser/ui/sync/browser_tests.profile_signin_confirmation_helper_browsertest.o.d -DV8_DEPRECATION_WARNINGS -DBLINK_SCALE_FILTERS_AT_RECORD_TIME -D_FILE_OFFSET_BITS=64 -DNO_TCMALLOC -DCHROMIUM_BUILD -DTOOLKIT_VIEWS=1 -DUI_COMPOSITOR_IMAGE_TRANSPORT -DUSE_AURA=1 -DUSE_CAIRO=1 -DUSE_GLIB=1 -DUSE_DEFAULT_RENDER_THEME=1 -DUSE_LIBJPEG_TURBO=1 -DUSE_NSS=1 -DUSE_X11=1 -DUSE_CLIPBOARD_AURAX11=1 -DENABLE_ONE_CLICK_SIGNIN -DUSE_XI2_MT=2 -DENABLE_REMOTING=1 -DENABLE_WEBRTC=1 -DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY -DENABLE_INPUT_SPEECH -DENABLE_NOTIFICATIONS -DENABLE_NEW_GAMEPAD_API=1 -DUSE_UDEV -DENABLE_EGLIMAGE=1 -DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PLUGIN_INSTALLATION=1 -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_BACKGROUND=1 -DENABLE_AUTOMATION=1 -DENABLE_GOOGLE_NOW=1 -DCLD_VERSION=2 -DENABLE_FULL_PRINTING=1 -DENABLE_PRINTING=1 -DENABLE_SPELLCHECK=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_MANAGED_USERS=1 -DENABLE_MDNS=1 -DHAS_OUT_OF_PROC_TEST_RUNNER -DFULL_SAFE_BROWSING -DGL_GLEXT_PROTOTYPES -DLIBPEERCONNECTION_LIB=1 -DGTEST_HAS_POSIX_RE=0 -DNACL_WINDOWS=0 -DNACL_LINUX=1 -DNACL_OSX=0 -DNACL_TARGET_SUBARCH=64 -DNACL_TARGET_ARCH=x86 -DNACL_BUILD_SUBARCH=64 -DNACL_BUILD_ARCH=x86 -DAUTOFILL_ENABLE_SYNC -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DSK_ENABLE_INST_COUNT=0 -DSK_SUPPORT_GPU=1 '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' -DSK_ENABLE_LEGACY_API_ALIASING=1 -DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1 -DGR_GL_IGNORE_ES3_MSAA=0 -DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1 -DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT -DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1 -DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1 -DSK_SUPPORT_LEGACY_COPYTO_CONFIG -DSK_SUPPORT_LEGACY_WRITEPIXELSCONFIG -DSK_SUPPORT_LEGACY_GETCLIPTYPE -DSK_SUPPORT_LEGACY_GETTOTALCLIP -DSK_USE_POSIX_THREADS -DSK_DEFERRED_CANVAS_USES_FACTORIES=1 -DFEATURE_ENABLE_SSL -DFEATURE_ENABLE_VOICEMAIL -DEXPAT_RELATIVE_PATH -DGTEST_RELATIVE_PATH -DNO_MAIN_THREAD_WRAPPING -DNO_SOUND_SYSTEM -DLINUX -DPOSIX -DUNIT_TEST -DGTEST_HAS_RTTI=0 -DU_USING_ICU_NAMESPACE=0 -DU_STATIC_IMPLEMENTATION '-DCUSTOM_BASICTYPES="base/basictypes.h"' '-DCUSTOM_SCOPED_PTR="base/memory/scoped_ptr.h"' -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DMEMORY_TOOL_REPLACES_ALLOCATOR -DADDRESS_SANITIZER -DLEAK_SANITIZER -DWTF_USE_LEAK_SANITIZER=1 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../.. -Igen -I../../skia/config -I../../third_party/khronos -I../../gpu -I../../third_party/WebKit/Source -Igen/chrome -I../../third_party/WebKit -I../../third_party/npapi -I../../third_party/npapi/bindings -I../../third_party/libpng -I../../third_party/zlib -I../../third_party/libwebp -I../../third_party/ots/include -I../../third_party/qcms/src -I../../third_party/iccjpeg -I../../third_party/libjpeg_turbo -Igen/policy -Igen/protoc_out -Iobj/chrome/browser_tests.gen -I../../third_party/protobuf -I../../third_party/protobuf/src -Igen/components -Igen/components/strings -I../../third_party/skia/src/core -I../../third_party/skia/include/core -I../../third_party/skia/include/effects -I../../third_party/skia/include/pdf -I../../third_party/skia/include/gpu -I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops -I../../third_party/skia/include/pipe -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../skia/ext -I../../third_party/libjingle/overrides -I../../third_party/libjingle/source -I../../testing/gtest/include -I../../third_party -I../../third_party/webrtc -I../../testing/gmock/include -I../../third_party/cacheinvalidation/overrides -I../../third_party/cacheinvalidation/src -I../../third_party/icu/source/i18n -I../../third_party/icu/source/common -I../../third_party/libaddressinput/chromium/cpp/include -I../../third_party/leveldatabase/src/include -I../../third_party/leveldatabase/src -I../../third_party/leveldatabase -Igen/ui/ui_resources -I../../v8/include -I../../net/third_party/nss/ssl -fstack-protector --param=ssp-buffer-size=4 -Werror -pthread -fno-exceptions -fno-strict-aliasing -Wall -Wno-unused-parameter -Wno-missing-field-initializers -fvisibility=hidden -pipe -fPIC -Wheader-hygiene -Wno-char-subscripts -Wno-unneeded-internal-declaration -Wno-covered-switch-default -Wstring-conversion -Wno-c++11-narrowing -Wno-reserved-user-defined-literal -Wno-deprecated-register -Xclang -load -Xclang /b/build/slave/Linux_ASan_LSan_Builder/build/src/tools/clang/scripts/../../../third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so -Xclang -add-plugin -Xclang find-bad-constructs -Xclang -plugin-arg-find-bad-constructs -Xclang check-url-directory -fcolor-diagnostics -pthread -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -pthread -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/nss -I/usr/include/nspr -Wno-header-guard -fno-omit-frame-pointer -gline-tables-only -fsanitize=address -w -fsanitize=leak -O2 -fdata-sections -ffunction-sections -funwind-tables -fno-rtti -fno-threadsafe-statics -fvisibility-inlines-hidden -Wsign-compare -std=gnu++11  -c ../../chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc -o obj/chrome/browser/ui/sync/browser_tests.profile_signin_confirmation_helper_browsertest.o
../../chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc:32:55:error: missing ')' after 'defined'
#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX || OS_LINUX)
                                                      ^
../../chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc:32:44: note: to match this '('
#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX || OS_LINUX)
                                           ^
../../chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc:46:55:error: missing ')' after 'defined'
#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX || OS_LINUX)
                                                      ^
../../chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc:46:44: note: to match this '('
#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX || OS_LINUX)

http://build.chromium.org/p/chromium.memory/builders/Linux%20ASan%2BLSan%20Builder/builds/691/steps/compile/logs/stdio


> Disabling tests in order to green up the waterfall.
> 
> BUG=321302
> TEST=None
> 
> 

TBR=matthewyuan@chromium.org

Review URL: https://codereview.chromium.org/196143002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256352 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 2 deletions

diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc
index ff041f2..2cf8d80 100644
--- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc
+++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc
@@ -29,7 +29,7 @@ class ProfileSigninConfirmationHelperBrowserTest : public InProcessBrowserTest {
 };
 
 // http://crbug.com/321302
-#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX || OS_LINUX)
+#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX)
 #define MAYBE_HasNotBeenShutdown DISABLED_HasNotBeenShutdown
 #else
 #define MAYBE_HasNotBeenShutdown HasNotBeenShutdown
@@ -43,7 +43,7 @@ IN_PROC_BROWSER_TEST_F(ProfileSigninConfirmationHelperBrowserTest,
 }
 
 // http://crbug.com/321302
-#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX || OS_LINUX)
+#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX)
 #define MAYBE_HasNoSyncedExtensions DISABLED_HasNoSyncedExtensions
 #else
 #define MAYBE_HasNoSyncedExtensions HasNoSyncedExtensions