Index: chrome/browser/chromeos/status/status_area_view_browsertest.cc |
diff --git a/chrome/browser/chromeos/status/status_area_view_browsertest.cc b/chrome/browser/chromeos/status/status_area_view_browsertest.cc |
index 6aceac67a0d5427490c77bcb9c4f7afa86cc2477..c25a92a2c2060e111580bc20e25e95e9f1168e98 100644 |
--- a/chrome/browser/chromeos/status/status_area_view_browsertest.cc |
+++ b/chrome/browser/chromeos/status/status_area_view_browsertest.cc |
@@ -7,20 +7,31 @@ |
#include "chrome/browser/chromeos/view_ids.h" |
#include "chrome/test/base/in_process_browser_test.h" |
#include "testing/gtest/include/gtest/gtest.h" |
+#include "views/view.h" |
+ |
+#if defined(USE_AURA) |
+#include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" |
+#endif |
namespace chromeos { |
class StatusAreaViewTest : public InProcessBrowserTest { |
protected: |
StatusAreaViewTest() : InProcessBrowserTest() {} |
- StatusAreaView* GetStatusAreaView() { |
- BrowserView* view = static_cast<BrowserView*>(browser()->window()); |
- return static_cast<StatusAreaView*>(view->GetViewByID(VIEW_ID_STATUS_AREA)); |
+ const StatusAreaView* GetStatusAreaView() { |
+ const views::View* view = |
+#if defined(USE_AURA) |
+ ChromeShellDelegate::instance()->GetStatusArea(); |
+#else |
+ static_cast<BrowserView*>(browser()->window()); |
+#endif |
+ return static_cast<const StatusAreaView*>( |
+ view->GetViewByID(VIEW_ID_STATUS_AREA)); |
} |
}; |
IN_PROC_BROWSER_TEST_F(StatusAreaViewTest, VisibleTest) { |
- StatusAreaView* status = GetStatusAreaView(); |
+ const StatusAreaView* status = GetStatusAreaView(); |
EXPECT_TRUE(status->IsVisibleInRootView()); |
EXPECT_FALSE(status->size().IsEmpty()); |
} |