Revert 270290 "Reduce creation of ViewsDelegate"

trunk/src/chrome/browser/sync/sync_error_notifier_ash_unittest.cc

 // Copyright 2014 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_error_notifier_ash.h"
 
 #include "ash/test/ash_test_base.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "chrome/browser/sync/sync_error_controller.h"
+#include "chrome/browser/ui/ash/test_views_delegate_with_parent.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/message_center/notification.h"
@@ skipping 66 matching lines @@
     content::BrowserContext* profile) {
   return new FakeLoginUIService();
 }
 
 class SyncErrorNotifierTest : public AshTestBase  {
  public:
   SyncErrorNotifierTest() {}
   virtual ~SyncErrorNotifierTest() {}
 
   virtual void SetUp() OVERRIDE {
+    views::ViewsDelegate::views_delegate = &views_delegate_;
+
     profile_manager_.reset(
         new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
     ASSERT_TRUE(profile_manager_->SetUp());
 
     profile_ = profile_manager_->CreateTestingProfile(kTestAccountId);
 
     TestingBrowserProcess::GetGlobal();
     AshTestBase::SetUp();
 
     // Set up a desktop screen for Windows to hold native widgets, used when
@@ skipping 55 matching lines @@
     }
   }
 
   scoped_ptr<TestingProfileManager> profile_manager_;
   scoped_ptr<SyncErrorController> error_controller_;
   scoped_ptr<SyncErrorNotifier> error_notifier_;
   scoped_ptr<NiceMock<ProfileSyncServiceMock> > service_;
   TestingProfile* profile_;
   FakeLoginUI login_ui_;
   NotificationUIManager* notification_ui_manager_;
+  TestViewsDelegateWithParent views_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncErrorNotifierTest);
 };
 
 } // namespace
 
 // Test that SyncErrorNotifier shows an notification if a passphrase is
 // required.
 TEST_F(SyncErrorNotifierTest, PassphraseNotification) {
   ASSERT_FALSE(notification_ui_manager_->FindById(kNotificationId));
@@ skipping 34 matching lines @@
     SCOPED_TRACE("Not expecting notification since sync setup is incomplete");
     VerifySyncErrorNotifierResult(
         GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS,
         false /* not signed in */,
         false /* no error */);
   }
 }
 
 }  // namespace test
 }  // namespace ash