Revert 270290 "Reduce creation of ViewsDelegate"

trunk/src/chrome/browser/signin/signin_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/signin/signin_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/signin/fake_signin_manager.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_error_notifier_factory_ash.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
+#include "chrome/browser/ui/ash/test_views_delegate_with_parent.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 "components/signin/core/browser/fake_auth_status_provider.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_error_controller.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/message_center/notification.h"
@@ skipping 29 matching lines @@
         gfx::SCREEN_TYPE_NATIVE;
   }
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenTypeDelegateDesktop);
 };
 #endif
 
 class SigninErrorNotifierTest : public AshTestBase {
  public:
   virtual void SetUp() OVERRIDE {
+    views::ViewsDelegate::views_delegate = &views_delegate_;
+
     // Create a signed-in profile.
     TestingProfile::Builder builder;
     builder.AddTestingFactory(SigninManagerFactory::GetInstance(),
                               FakeSigninManagerBase::Build);
     profile_ = builder.Build();
     profile_->set_profile_name(kTestAccountId);
 
     profile_manager_.reset(
         new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
     ASSERT_TRUE(profile_manager_->SetUp());
@@ skipping 26 matching lines @@
     const Notification* notification =
         g_browser_process->notification_ui_manager()->FindById(kNotificationId);
     ASSERT_FALSE(notification == NULL);
     *message = notification->message();
   }
 
   scoped_ptr<TestingProfileManager> profile_manager_;
   scoped_ptr<TestingProfile> profile_;
   SigninErrorController* error_controller_;
   NotificationUIManager* notification_ui_manager_;
+  TestViewsDelegateWithParent views_delegate_;
 };
 
 TEST_F(SigninErrorNotifierTest, NoErrorAuthStatusProviders) {
   ASSERT_FALSE(notification_ui_manager_->FindById(kNotificationId));
   {
     // Add a provider (removes itself on exiting this scope).
     FakeAuthStatusProvider provider(error_controller_);
     ASSERT_FALSE(notification_ui_manager_->FindById(kNotificationId));
   }
   ASSERT_FALSE(notification_ui_manager_->FindById(kNotificationId));
@@ skipping 101 matching lines @@
       EXPECT_FALSE(notification->title().empty());
       EXPECT_FALSE(notification->message().empty());
       EXPECT_EQ((size_t)1, notification->buttons().size());
     }
   }
 }
 #endif
 
 }  // namespace test
 }  // namespace ash