Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Unified Diff: trunk/src/chrome/browser/sync/sync_error_notifier_ash_unittest.cc

Issue 286753002: Revert 270290 "Reduce creation of ViewsDelegate" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
===================================================================
--- trunk/src/chrome/browser/sync/sync_error_notifier_ash_unittest.cc (revision 270304)
+++ trunk/src/chrome/browser/sync/sync_error_notifier_ash_unittest.cc (working copy)
@@ -11,6 +11,7 @@
#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"
@@ -97,6 +98,8 @@
virtual ~SyncErrorNotifierTest() {}
virtual void SetUp() OVERRIDE {
+ views::ViewsDelegate::views_delegate = &views_delegate_;
+
profile_manager_.reset(
new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
ASSERT_TRUE(profile_manager_->SetUp());
@@ -172,6 +175,7 @@
TestingProfile* profile_;
FakeLoginUI login_ui_;
NotificationUIManager* notification_ui_manager_;
+ TestViewsDelegateWithParent views_delegate_;
DISALLOW_COPY_AND_ASSIGN(SyncErrorNotifierTest);
};

Powered by Google App Engine
This is Rietveld 408576698