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

Unified Diff: ash/shelf/shelf_widget_unittest.cc

Issue 23449033: [ash] Remove Launcher::GetLauncherViewForTest() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing class keyword Created 7 years, 3 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
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/test/launcher_test_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_widget_unittest.cc
diff --git a/ash/shelf/shelf_widget_unittest.cc b/ash/shelf/shelf_widget_unittest.cc
index 2de02bc3c53fa0c02c304f469e6f03e03fb69148..b12549fb64e7e6bc3b50af2cb10c525bb5877c39 100644
--- a/ash/shelf/shelf_widget_unittest.cc
+++ b/ash/shelf/shelf_widget_unittest.cc
@@ -12,6 +12,7 @@
#include "ash/shelf/shelf_layout_manager.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
+#include "ash/test/launcher_test_api.h"
#include "ash/test/launcher_view_test_api.h"
#include "ash/wm/window_util.h"
#include "ui/aura/root_window.h"
@@ -140,7 +141,7 @@ TEST_F(ShelfWidgetTest, LauncherInitiallySized) {
// Test only makes sense if the status is > 0, which it better be.
EXPECT_GT(status_width, 0);
EXPECT_EQ(status_width, shelf_widget->GetContentsView()->width() -
- launcher->GetLauncherViewForTest()->width());
+ test::LauncherTestAPI(launcher).launcher_view()->width());
}
// Verifies when the shell is deleted with a full screen window we don't crash.
@@ -186,7 +187,7 @@ TEST_F(ShelfWidgetTest, LauncherInitiallySizedAfterLogin) {
EXPECT_GT(status_width, 0);
EXPECT_EQ(status_width,
shelf->GetContentsView()->width() -
- launcher->GetLauncherViewForTest()->width());
+ test::LauncherTestAPI(launcher).launcher_view()->width());
}
#endif
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/test/launcher_test_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698