Enable the MD User Menu by default on trunk.

chrome/browser/sync/sync_global_error_unittest.cc

Index: chrome/browser/sync/sync_global_error_unittest.cc
diff --git a/chrome/browser/sync/sync_global_error_unittest.cc b/chrome/browser/sync/sync_global_error_unittest.cc
index ec3a59c7806d8958a006c9016e335ccf9559fcfc..48cf0414091e83f5d999eaec2dd444901c2a9d47 100644
--- a/chrome/browser/sync/sync_global_error_unittest.cc
+++ b/chrome/browser/sync/sync_global_error_unittest.cc
@@ -16,6 +16,7 @@
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
@@ -123,6 +124,11 @@ void VerifySyncGlobalErrorResult(browser_sync::ProfileSyncServiceMock* service,
 
 // Test that SyncGlobalError shows an error if a passphrase is required.
 TEST_F(SyncGlobalErrorTest, PassphraseGlobalError) {
+  // The MD User Menu displays Sync errors in a different way and should be the
+  // only one to do so. Under that paradigm, this test is obsolete.
+  if (switches::IsMaterialDesignUserMenu())

[maxbogue, 2016/10/06 19:22:36]

Presumably at some point this switch will be removed and then this entire test
would be removed as well?

[anthonyvd, 2016/10/06 19:25:44]

Absolutely. There's going to be some clean up involved when removing that switch
and this is part of it.

+    return;
+
   browser_sync::ProfileSyncServiceMock service(
       CreateProfileSyncServiceParamsForTest(profile()));