ash: Fix variable names and setters in ShelfLayoutManager and tests

ash/system/user/tray_user_unittest.cc

 // Copyright 2013 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 <vector>
 
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
@@ skipping 29 matching lines @@
   // Show the system tray menu using the provided event generator.
   void ShowTrayMenu(ui::test::EventGenerator* generator);
 
   // Move the mouse over the user item.
   void MoveOverUserItem(ui::test::EventGenerator* generator, int index);
 
   // Click on the user item. Note that the tray menu needs to be shown.
   void ClickUserItem(ui::test::EventGenerator* generator, int index);
 
   // Accessors to various system components.
-  ShelfLayoutManager* shelf() { return shelf_; }
+  ShelfLayoutManager* shelf_layout_manager() { return shelf_layout_manager_; }
   SystemTray* tray() { return tray_; }
   ash::test::TestSessionStateDelegate* delegate() { return delegate_; }
   ash::TrayUser* tray_user(int index) { return tray_user_[index]; }
   ash::TrayUserSeparator* tray_user_separator() { return tray_user_separator_; }
 
  private:
-  ShelfLayoutManager* shelf_;
+  ShelfLayoutManager* shelf_layout_manager_;

[msw, 2016/06/01 00:53:24]

nit: remove member altogether; it's only used once.

[James Cook, 2016/06/01 15:53:06]

Done.

   SystemTray* tray_;
   ash::test::TestSessionStateDelegate* delegate_;
 
   // Note that the ownership of these items is on the shelf.
   std::vector<ash::TrayUser*> tray_user_;
 
   // The separator between the tray users and the rest of the menu.
   // Note: The item will get owned by the shelf.
   TrayUserSeparator* tray_user_separator_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayUserTest);
 };
 
 TrayUserTest::TrayUserTest()
-    : shelf_(NULL),
-      tray_(NULL),
-      delegate_(NULL),
-      tray_user_separator_(NULL) {
-}
+    : shelf_layout_manager_(nullptr),
+      tray_(nullptr),
+      delegate_(nullptr),
+      tray_user_separator_(nullptr) {}
 
 void TrayUserTest::SetUp() {
   ash::test::AshTestBase::SetUp();
-  shelf_ = Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager();
+  shelf_layout_manager_ =
+      Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager();
   tray_ = Shell::GetPrimaryRootWindowController()->GetSystemTray();
   delegate_ = static_cast<ash::test::TestSessionStateDelegate*>(
       ash::Shell::GetInstance()->session_state_delegate());
 }
 
 void TrayUserTest::InitializeParameters(int users_logged_in,
                                         bool multiprofile) {
   // Show the shelf.
-  shelf()->LayoutShelf();
-  shelf()->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
+  shelf_layout_manager()->LayoutShelf();
+  Shelf::ForPrimaryDisplay()->SetAutoHideBehavior(
+      SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
 
   // Set our default assumptions. Note that it is sufficient to set these
   // after everything was created.
   delegate_->set_logged_in_users(users_logged_in);
   ash::test::TestShellDelegate* shell_delegate =
       static_cast<ash::test::TestShellDelegate*>(
           ash::Shell::GetInstance()->delegate());
   shell_delegate->set_multi_profiles_enabled(multiprofile);
 
   // Instead of using the existing tray panels we create new ones which makes
@@ skipping 176 matching lines @@
   // Since the name is capitalized, the email should be different then the
   // user_id.
   EXPECT_NE(active_user->GetAccountId().GetUserEmail(),
             second_user->GetEmail());
   tray()->CloseSystemBubble();
 }
 
 #endif
 
 }  // namespace ash