Fix Chrome crashes on calling OnTrayVisibilityChange

ash/common/system/tray/system_tray_unittest.cc

 // Copyright (c) 2012 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 "ash/common/system/tray/system_tray.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/common/accelerators/accelerator_controller.h"
@@ skipping 42 matching lines @@
   ~ModalWidgetDelegate() override {}
 
   ui::ModalType GetModalType() const override { return ui::MODAL_TYPE_SYSTEM; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ModalWidgetDelegate);
 };
 
 }  // namespace
 
-typedef AshTestBase SystemTrayTest;
+class SystemTrayTest : public AshTestBase {
+ public:
+  SystemTrayTest() {}
+  ~SystemTrayTest() override {}
+
+  bool AreTraysInitialized(StatusAreaWidget* widget) {

[varkha, 2016/12/09 00:59:03]

nit: I think this could be IsWidgetInitialized().

[yiyix, 2016/12/09 20:04:53]

Done.

+    return widget->is_initialized_;
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(SystemTrayTest);
+};
 
 // Verifies only the visible default views are recorded in the
 // "Ash.SystemMenu.DefaultView.VisibleItems" histogram.
 TEST_F(SystemTrayTest, OnlyVisibleItemsRecorded) {
   SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->GetWidget());
 
   TestSystemTrayItem* test_item = new TestSystemTrayItem();
   tray->AddTrayItem(test_item);
 
@@ skipping 583 matching lines @@
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
   RunAllPendingInMessageLoop();
   EXPECT_LT(0, notification_tray->tray_bubble_height_for_test());
 
   // Hide the default view, ensure the tray bubble height is back to zero.
   ASSERT_TRUE(tray->CloseSystemBubble());
   RunAllPendingInMessageLoop();
 
   EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test());
 }
+
+// Calling OnVisibilityChange on uninitialized |tray| caused crashes, see

[varkha, 2016/12/09 00:59:03]

nit: s/uninitialized |tray|/StatusAreaWidget that has been Shutdown

[yiyix, 2016/12/09 20:04:53]

I was not sure how to describe StatusAreaWidget that have trays uninitialized, I
like your wording.

+// crbug.com/671293. Test if crash is mitigated.
+TEST_F(SystemTrayTest, SystemTrayInitialization) {

[varkha, 2016/12/09 00:59:03]

Thanks for putting this together.

[yiyix, 2016/12/09 20:04:53]

:D

+  StatusAreaWidget* widget = StatusAreaWidgetTestHelper::GetStatusAreaWidget();
+  WebNotificationTray* notification_tray =
+      StatusAreaWidgetTestHelper::GetStatusAreaWidget()
+          ->web_notification_tray();

[varkha, 2016/12/09 00:59:03]

nit: can move this down close to the place you use it, i.e. before line 689.

[yiyix, 2016/12/09 20:04:53]

Done.

+  EXPECT_TRUE(AreTraysInitialized(widget));
+  widget->Shutdown();
+  EXPECT_FALSE(AreTraysInitialized(widget));
+  widget->OnTrayVisibilityChanged(notification_tray);
+
+  widget->CreateTrayViews();
+  EXPECT_TRUE(AreTraysInitialized(widget));
+  widget->OnTrayVisibilityChanged(notification_tray);
+}
 #endif  // OS_CHROMEOS
 
 }  // namespace test
 }  // namespace ash