[Ash MD] Restore focus on detailed row when exiting detailed view

ash/common/system/tray/tray_details_view_unittest.cc

Index: ash/common/system/tray/tray_details_view_unittest.cc
diff --git a/ash/common/system/tray/tray_details_view_unittest.cc b/ash/common/system/tray/tray_details_view_unittest.cc
index 8fb70e0dbb7523da254e9b98151af0e3eb79cdc6..c5ea6a601b27733e6861a78e1344a7cdb04088c8 100644
--- a/ash/common/system/tray/tray_details_view_unittest.cc
+++ b/ash/common/system/tray/tray_details_view_unittest.cc
@@ -138,6 +138,10 @@ class TrayDetailsViewTest : public AshTestBase {
     detailed->TransitionToDefaultView();
   }
 
+  void FocusBackButton(TestDetailsView* detailed) {
+    detailed->back_button_->RequestFocus();
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(TrayDetailsViewTest);
 };
@@ -167,7 +171,10 @@ TEST_F(TrayDetailsViewTest, TransitionToDefaultViewTest) {
 
   // Transition back to default view, the default view of item 2 should have
   // focus.
-  test_item_2->detailed_view()->FocusTitleRow();
+  if (MaterialDesignController::IsSystemTrayMenuMaterial())
+    FocusBackButton(test_item_2->detailed_view());
+  else
+    test_item_2->detailed_view()->FocusTitleRow();
   TransitionFromDetailedToDefaultView(test_item_2->detailed_view());
   RunAllPendingInMessageLoop();