Enable the MD User Menu by default on trunk.

chrome/browser/sync/sync_global_error_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/sync_global_error.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/sync/profile_sync_test_util.h"
 #include "chrome/browser/sync/sync_global_error_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #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"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::NiceMock;
 using ::testing::Return;
 using ::testing::ReturnRef;
 using ::testing::_;
@@ skipping 87 matching lines @@
     ASSERT_GT(login_ui->focus_ui_call_count(), 0);
     global_error->BubbleViewAcceptButtonPressed(browser);
     global_error->BubbleViewDidClose(browser);
   }
 }
 
 }  // namespace
 
 // 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()));
 
   FakeLoginUIService* login_ui_service = static_cast<FakeLoginUIService*>(
       LoginUIServiceFactory::GetInstance()->SetTestingFactoryAndUse(
           profile(), BuildMockLoginUIService));
   FakeLoginUI login_ui;
   login_ui_service->SetLoginUI(&login_ui);
 
   syncer::SyncErrorController error(&service);
@@ skipping 27 matching lines @@
               .WillRepeatedly(Return(true));
   EXPECT_CALL(service, IsPassphraseRequiredForDecryption())
               .WillRepeatedly(Return(true));
   VerifySyncGlobalErrorResult(
       &service, login_ui_service, browser(), &error, &global_error,
       GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS,
       false /* not signed in */, false /* no error */);
 
   global_error.Shutdown();
 }