clang-format all of //ash

ash/shelf/shelf_layout_manager_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/shelf/shelf_layout_manager.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/ash_switches.h"
@@ skipping 92 matching lines @@
   bool WasValidAnimation() const {
     return done_waiting_ && animation_steps_ > 0;
   }
 
  private:
   // Returns true if shelf has finished animating to the target size.
   bool IsDoneAnimating() const {
     ShelfLayoutManager* layout_manager = GetShelfLayoutManager();
     gfx::Rect current_bounds = GetShelfWidget()->GetWindowBoundsInScreen();
     int size = layout_manager->PrimaryAxisValue(current_bounds.height(),
-        current_bounds.width());
+                                                current_bounds.width());
     int desired_size = layout_manager->PrimaryAxisValue(target_bounds_.height(),
-        target_bounds_.width());
+                                                        target_bounds_.width());
     return (size == desired_size);
   }
 
   // views::WidgetObserver override.
   void OnWidgetBoundsChanged(views::Widget* widget,
                              const gfx::Rect& new_bounds) override {
     if (done_waiting_)
       return;
 
     ++animation_steps_;
@@ skipping 12 matching lines @@
 
 class ShelfDragCallback {
  public:
   ShelfDragCallback(const gfx::Rect& not_visible, const gfx::Rect& visible)
       : not_visible_bounds_(not_visible),
         visible_bounds_(visible),
         was_visible_on_drag_start_(false) {
     EXPECT_EQ(not_visible_bounds_.bottom(), visible_bounds_.bottom());
   }
 
-  virtual ~ShelfDragCallback() {
-  }
+  virtual ~ShelfDragCallback() {}
 
   void ProcessScroll(ui::EventType type, const gfx::Vector2dF& delta) {
     if (GetShelfLayoutManager()->visibility_state() == ash::SHELF_HIDDEN)
       return;
 
     if (type == ui::ET_GESTURE_SCROLL_BEGIN) {
       scroll_ = gfx::Vector2dF();
       was_visible_on_drag_start_ = GetShelfLayoutManager()->IsVisible();
       return;
     }
@@ skipping 21 matching lines @@
 
     // if the shelf is being dimmed test dimmer bounds as well.
     if (GetShelfWidget()->GetDimsShelf())
       EXPECT_EQ(GetShelfWidget()->GetWindowBoundsInScreen(),
                 GetShelfWidget()->GetDimmerBoundsForTest());
 
     // The shelf should never be smaller than the hidden state when shelf is
     // visible; the shelf has a height of 0 when it is hidden.
     if (was_visible_on_drag_start_)
       EXPECT_GE(shelf_bounds.height(), not_visible_bounds_.height());
-    float scroll_delta = GetShelfLayoutManager()->PrimaryAxisValue(
-        scroll_.y(),
-        scroll_.x());
+    float scroll_delta =
+        GetShelfLayoutManager()->PrimaryAxisValue(scroll_.y(), scroll_.x());
     bool increasing_drag =
         GetShelfWidget()->shelf()->SelectValueForShelfAlignment(
-            scroll_delta < 0, scroll_delta > 0, scroll_delta < 0);
+            scroll_delta<0, scroll_delta> 0, scroll_delta < 0);
     int shelf_size = GetShelfLayoutManager()->PrimaryAxisValue(
-        shelf_bounds.height(),
-        shelf_bounds.width());
+        shelf_bounds.height(), shelf_bounds.width());
     int visible_bounds_size = GetShelfLayoutManager()->PrimaryAxisValue(
-        visible_bounds_.height(),
-        visible_bounds_.width());
+        visible_bounds_.height(), visible_bounds_.width());
     int not_visible_bounds_size = GetShelfLayoutManager()->PrimaryAxisValue(
-        not_visible_bounds_.height(),
-        not_visible_bounds_.width());
+        not_visible_bounds_.height(), not_visible_bounds_.width());
     if (was_visible_on_drag_start_) {
       if (increasing_drag) {
         // If dragging inwards from the visible state, then the shelf should
         // increase in size, but not more than the scroll delta.
         EXPECT_LE(visible_bounds_size, shelf_size);
         EXPECT_LE(std::abs(shelf_size - visible_bounds_size),
                   std::abs(scroll_delta));
       } else {
         if (shelf_size > not_visible_bounds_size) {
           // If dragging outwards from the visible state, then the shelf
@@ skipping 19 matching lines @@
   const gfx::Rect not_visible_bounds_;
   const gfx::Rect visible_bounds_;
   gfx::Vector2dF scroll_;
   bool was_visible_on_drag_start_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfDragCallback);
 };
 
 class ShelfLayoutObserverTest : public ShelfLayoutManagerObserver {
  public:
-  ShelfLayoutObserverTest()
-      : changed_auto_hide_state_(false) {
-  }
+  ShelfLayoutObserverTest() : changed_auto_hide_state_(false) {}
 
   ~ShelfLayoutObserverTest() override {}
 
   bool changed_auto_hide_state() const { return changed_auto_hide_state_; }
 
  private:
   // ShelfLayoutManagerObserver:
   void OnAutoHideStateChanged(ShelfAutoHideState new_state) override {
     changed_auto_hide_state_ = true;
   }
@@ skipping 171 matching lines @@
   ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   const int kNumScrollSteps = 4;
   ShelfDragCallback handler(shelf_hidden, shelf_shown);
 
   // Swipe up on the shelf. This should not change any state.
   gfx::Point start = GetShelfWidget()->GetWindowBoundsInScreen().CenterPoint();
   gfx::Point end = start + delta;
 
   // Swipe down on the shelf to hide it.
   generator.GestureScrollSequenceWithCallback(
-      start,
-      end,
-      kTimeDelta,
-      kNumScrollSteps,
+      start, end, kTimeDelta, kNumScrollSteps,
       base::Bind(&ShelfDragCallback::ProcessScroll,
                  base::Unretained(&handler)));
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, shelf->auto_hide_behavior());
   EXPECT_NE(bounds_shelf.ToString(), window->bounds().ToString());
   EXPECT_NE(shelf_shown.ToString(),
             GetShelfWidget()->GetWindowBoundsInScreen().ToString());
 
   // Swipe up to show the shelf.
   generator.GestureScrollSequenceWithCallback(
-      end,
-      start,
-      kTimeDelta,
-      kNumScrollSteps,
+      end, start, kTimeDelta, kNumScrollSteps,
       base::Bind(&ShelfDragCallback::ProcessScroll,
                  base::Unretained(&handler)));
   EXPECT_EQ(SHELF_VISIBLE, shelf->GetVisibilityState());
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_NEVER, shelf->auto_hide_behavior());
   EXPECT_EQ(bounds_shelf.ToString(), window->bounds().ToString());
   EXPECT_EQ(GetShelfWidget()->GetDimmerBoundsForTest(),
             GetShelfWidget()->GetWindowBoundsInScreen());
   EXPECT_EQ(shelf_shown.ToString(),
             GetShelfWidget()->GetWindowBoundsInScreen().ToString());
 
   // Swipe up again. The shelf should hide.
   end = start - delta;
   generator.GestureScrollSequenceWithCallback(
-      start,
-      end,
-      kTimeDelta,
-      kNumScrollSteps,
+      start, end, kTimeDelta, kNumScrollSteps,
       base::Bind(&ShelfDragCallback::ProcessScroll,
                  base::Unretained(&handler)));
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, shelf->auto_hide_behavior());
   EXPECT_EQ(shelf_hidden.ToString(),
             GetShelfWidget()->GetWindowBoundsInScreen().ToString());
 
   // Swipe up yet again to show it.
   end = start + delta;
   generator.GestureScrollSequenceWithCallback(
-      end,
-      start,
-      kTimeDelta,
-      kNumScrollSteps,
+      end, start, kTimeDelta, kNumScrollSteps,
       base::Bind(&ShelfDragCallback::ProcessScroll,
                  base::Unretained(&handler)));
 
   // Swipe down very little. It shouldn't change any state.
   if (GetShelfLayoutManager()->IsHorizontalAlignment())
     end.set_y(start.y() + shelf_shown.height() * 3 / 10);
   else if (SHELF_ALIGNMENT_LEFT == GetShelfLayoutManager()->GetAlignment())
     end.set_x(start.x() - shelf_shown.width() * 3 / 10);
   else if (SHELF_ALIGNMENT_RIGHT == GetShelfLayoutManager()->GetAlignment())
     end.set_x(start.x() + shelf_shown.width() * 3 / 10);
   generator.GestureScrollSequence(start, end, kTimeDelta, 5);
   EXPECT_EQ(SHELF_VISIBLE, shelf->GetVisibilityState());
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_NEVER, shelf->auto_hide_behavior());
   EXPECT_EQ(bounds_shelf.ToString(), window->bounds().ToString());
   EXPECT_EQ(shelf_shown.ToString(),
             GetShelfWidget()->GetWindowBoundsInScreen().ToString());
 
   // Swipe down again to hide.
   end = start + delta;
   generator.GestureScrollSequenceWithCallback(
-      start,
-      end,
-      kTimeDelta,
-      kNumScrollSteps,
+      start, end, kTimeDelta, kNumScrollSteps,
       base::Bind(&ShelfDragCallback::ProcessScroll,
                  base::Unretained(&handler)));
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, shelf->auto_hide_behavior());
   EXPECT_EQ(GetShelfWidget()->GetDimmerBoundsForTest(), gfx::Rect());
   EXPECT_EQ(bounds_noshelf.ToString(), window->bounds().ToString());
   EXPECT_EQ(shelf_hidden.ToString(),
             GetShelfWidget()->GetWindowBoundsInScreen().ToString());
 
   // Swipe up in extended hit region to show it.
   gfx::Point extended_start = start;
   if (GetShelfLayoutManager()->IsHorizontalAlignment())
-    extended_start.set_y(GetShelfWidget()->GetWindowBoundsInScreen().y() -1);
+    extended_start.set_y(GetShelfWidget()->GetWindowBoundsInScreen().y() - 1);
   else if (SHELF_ALIGNMENT_LEFT == GetShelfLayoutManager()->GetAlignment())
-    extended_start.set_x(
-        GetShelfWidget()->GetWindowBoundsInScreen().right() + 1);
+    extended_start.set_x(GetShelfWidget()->GetWindowBoundsInScreen().right() +
+                         1);
   else if (SHELF_ALIGNMENT_RIGHT == GetShelfLayoutManager()->GetAlignment())
     extended_start.set_x(GetShelfWidget()->GetWindowBoundsInScreen().x() - 1);
   end = extended_start - delta;
   generator.GestureScrollSequenceWithCallback(
-      extended_start,
-      end,
-      kTimeDelta,
-      kNumScrollSteps,
+      extended_start, end, kTimeDelta, kNumScrollSteps,
       base::Bind(&ShelfDragCallback::ProcessScroll,
                  base::Unretained(&handler)));
   EXPECT_EQ(SHELF_VISIBLE, shelf->GetVisibilityState());
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_NEVER, shelf->auto_hide_behavior());
   EXPECT_EQ(bounds_shelf.ToString(), window->bounds().ToString());
   EXPECT_EQ(GetShelfWidget()->GetDimmerBoundsForTest(),
             GetShelfWidget()->GetWindowBoundsInScreen());
   EXPECT_EQ(shelf_shown.ToString(),
             GetShelfWidget()->GetWindowBoundsInScreen().ToString());
 
   // Swipe down again to hide.
   end = start + delta;
   generator.GestureScrollSequenceWithCallback(
-      start,
-      end,
-      kTimeDelta,
-      kNumScrollSteps,
+      start, end, kTimeDelta, kNumScrollSteps,
       base::Bind(&ShelfDragCallback::ProcessScroll,
                  base::Unretained(&handler)));
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, shelf->auto_hide_behavior());
   EXPECT_EQ(GetShelfWidget()->GetDimmerBoundsForTest(), gfx::Rect());
   EXPECT_EQ(bounds_noshelf.ToString(), window->bounds().ToString());
   EXPECT_EQ(shelf_hidden.ToString(),
             GetShelfWidget()->GetWindowBoundsInScreen().ToString());
 
   // Swipe up outside the hit area. This should not change anything.
-  gfx::Point outside_start = gfx::Point(
-      (GetShelfWidget()->GetWindowBoundsInScreen().x() +
-       GetShelfWidget()->GetWindowBoundsInScreen().right())/2,
-      GetShelfWidget()->GetWindowBoundsInScreen().y() - 50);
+  gfx::Point outside_start =
+      gfx::Point((GetShelfWidget()->GetWindowBoundsInScreen().x() +
+                  GetShelfWidget()->GetWindowBoundsInScreen().right()) /
+                     2,
+                 GetShelfWidget()->GetWindowBoundsInScreen().y() - 50);
   end = outside_start + delta;
-  generator.GestureScrollSequence(
-      outside_start, end, kTimeDelta, kNumScrollSteps);
+  generator.GestureScrollSequence(outside_start, end, kTimeDelta,
+                                  kNumScrollSteps);
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, shelf->auto_hide_behavior());
   EXPECT_EQ(shelf_hidden.ToString(),
             GetShelfWidget()->GetWindowBoundsInScreen().ToString());
 
   // Swipe up from below the shelf where a bezel would be, this should show the
   // shelf.
   gfx::Point below_start = start;
   if (GetShelfLayoutManager()->IsHorizontalAlignment())
     below_start.set_y(GetShelfWidget()->GetWindowBoundsInScreen().bottom() + 1);
   else if (SHELF_ALIGNMENT_LEFT == GetShelfLayoutManager()->GetAlignment())
-    below_start.set_x(
-        GetShelfWidget()->GetWindowBoundsInScreen().x() - 1);
+    below_start.set_x(GetShelfWidget()->GetWindowBoundsInScreen().x() - 1);
   else if (SHELF_ALIGNMENT_RIGHT == GetShelfLayoutManager()->GetAlignment())
     below_start.set_x(GetShelfWidget()->GetWindowBoundsInScreen().right() + 1);
   end = below_start - delta;
-  generator.GestureScrollSequence(
-      below_start, end, kTimeDelta, kNumScrollSteps);
+  generator.GestureScrollSequence(below_start, end, kTimeDelta,
+                                  kNumScrollSteps);
   EXPECT_EQ(SHELF_VISIBLE, shelf->GetVisibilityState());
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_NEVER, shelf->auto_hide_behavior());
   EXPECT_EQ(bounds_shelf.ToString(), window->bounds().ToString());
   EXPECT_EQ(GetShelfWidget()->GetDimmerBoundsForTest(),
             GetShelfWidget()->GetWindowBoundsInScreen());
   EXPECT_EQ(shelf_shown.ToString(),
             GetShelfWidget()->GetWindowBoundsInScreen().ToString());
 
   // Swipe down again to hide.
   end = start + delta;
   generator.GestureScrollSequenceWithCallback(
-      start,
-      end,
-      kTimeDelta,
-      kNumScrollSteps,
+      start, end, kTimeDelta, kNumScrollSteps,
       base::Bind(&ShelfDragCallback::ProcessScroll,
                  base::Unretained(&handler)));
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, shelf->auto_hide_behavior());
   EXPECT_EQ(GetShelfWidget()->GetDimmerBoundsForTest(), gfx::Rect());
   EXPECT_EQ(bounds_noshelf.ToString(), window->bounds().ToString());
   EXPECT_EQ(shelf_hidden.ToString(),
             GetShelfWidget()->GetWindowBoundsInScreen().ToString());
 
   // Put |widget| into fullscreen. Set the shelf to be auto hidden when |widget|
   // is fullscreen. (eg browser immersive fullscreen).
   widget->SetFullscreen(true);
   wm::GetWindowState(window)->set_hide_shelf_when_fullscreen(false);
   layout_manager->UpdateVisibilityState();
 
   gfx::Rect bounds_fullscreen = window->bounds();
   EXPECT_TRUE(widget->IsFullscreen());
   EXPECT_NE(bounds_noshelf.ToString(), bounds_fullscreen.ToString());
 
   // Swipe up. This should show the shelf.
   end = below_start - delta;
   generator.GestureScrollSequenceWithCallback(
-      below_start,
-      end,
-      kTimeDelta,
-      kNumScrollSteps,
+      below_start, end, kTimeDelta, kNumScrollSteps,
       base::Bind(&ShelfDragCallback::ProcessScroll,
                  base::Unretained(&handler)));
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
   EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState());
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_NEVER, shelf->auto_hide_behavior());
   EXPECT_EQ(shelf_shown.ToString(),
             GetShelfWidget()->GetWindowBoundsInScreen().ToString());
   EXPECT_EQ(bounds_fullscreen.ToString(), window->bounds().ToString());
 
   // Swipe up again. This should hide the shelf.
   generator.GestureScrollSequenceWithCallback(
-      below_start,
-      end,
-      kTimeDelta,
-      kNumScrollSteps,
+      below_start, end, kTimeDelta, kNumScrollSteps,
       base::Bind(&ShelfDragCallback::ProcessScroll,
                  base::Unretained(&handler)));
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, shelf->auto_hide_behavior());
   EXPECT_EQ(shelf_hidden.ToString(),
             GetShelfWidget()->GetWindowBoundsInScreen().ToString());
   EXPECT_EQ(bounds_fullscreen.ToString(), window->bounds().ToString());
 
   // Set the shelf to be hidden when |widget| is fullscreen. (eg tab fullscreen
   // with or without immersive browser fullscreen).
   wm::GetWindowState(window)->set_hide_shelf_when_fullscreen(true);
   layout_manager->UpdateVisibilityState();
   EXPECT_EQ(SHELF_HIDDEN, shelf->GetVisibilityState());
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, shelf->auto_hide_behavior());
 
   // Swipe-up. This should not change anything.
   end = start - delta;
   generator.GestureScrollSequenceWithCallback(
-      below_start,
-      end,
-      kTimeDelta,
-      kNumScrollSteps,
+      below_start, end, kTimeDelta, kNumScrollSteps,
       base::Bind(&ShelfDragCallback::ProcessScroll,
                  base::Unretained(&handler)));
   EXPECT_EQ(SHELF_HIDDEN, shelf->GetVisibilityState());
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, shelf->auto_hide_behavior());
   EXPECT_EQ(bounds_fullscreen.ToString(), window->bounds().ToString());
 
   // Close actually, otherwise further event may be affected since widget
   // is fullscreen status.
   widget->Close();
   RunAllPendingInMessageLoop();
 
   // The shelf should be shown because there are no more visible windows.
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
   EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState());
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, shelf->auto_hide_behavior());
 
   // Swipe-up to hide. This should have no effect because there are no visible
   // windows.
   end = below_start - delta;
   generator.GestureScrollSequenceWithCallback(
-      below_start,
-      end,
-      kTimeDelta,
-      kNumScrollSteps,
+      below_start, end, kTimeDelta, kNumScrollSteps,
       base::Bind(&ShelfDragCallback::ProcessScroll,
                  base::Unretained(&handler)));
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
   EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState());
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, shelf->auto_hide_behavior());
 }
 
 // Need to be implemented.  http://crbug.com/111279.
 #if defined(OS_WIN)
 #define MAYBE_SetVisible DISABLED_SetVisible
@@ skipping 18 matching lines @@
   ASSERT_NE(-1, display.id());
   // Bottom inset should be the max of widget heights.
   EXPECT_EQ(shelf_height, display.GetWorkAreaInsets().bottom());
 
   // Hide the shelf.
   SetState(manager, SHELF_HIDDEN);
   // Run the animation to completion.
   StepWidgetLayerAnimatorToEnd(shelf_widget);
   StepWidgetLayerAnimatorToEnd(shelf_widget->status_area_widget());
   EXPECT_EQ(SHELF_HIDDEN, manager->visibility_state());
-  display = screen->GetDisplayNearestWindow(
-      Shell::GetPrimaryRootWindow());
+  display = screen->GetDisplayNearestWindow(Shell::GetPrimaryRootWindow());
 
   EXPECT_EQ(0, display.GetWorkAreaInsets().bottom());
 
   // Make sure the bounds of the two widgets changed.
   EXPECT_GE(shelf_widget->GetNativeView()->bounds().y(),
             screen->GetPrimaryDisplay().bounds().bottom());
   EXPECT_GE(shelf_widget->status_area_widget()->GetNativeView()->bounds().y(),
             screen->GetPrimaryDisplay().bounds().bottom());
 
   // And show it again.
   SetState(manager, SHELF_VISIBLE);
   // Run the animation to completion.
   StepWidgetLayerAnimatorToEnd(shelf_widget);
   StepWidgetLayerAnimatorToEnd(shelf_widget->status_area_widget());
   EXPECT_EQ(SHELF_VISIBLE, manager->visibility_state());
-  display = screen->GetDisplayNearestWindow(
-      Shell::GetPrimaryRootWindow());
+  display = screen->GetDisplayNearestWindow(Shell::GetPrimaryRootWindow());
   EXPECT_EQ(shelf_height, display.GetWorkAreaInsets().bottom());
 
   // Make sure the bounds of the two widgets changed.
   shelf_bounds = shelf_widget->GetNativeView()->bounds();
   EXPECT_LT(shelf_bounds.y(), screen->GetPrimaryDisplay().bounds().bottom());
   status_bounds = shelf_widget->status_area_widget()->GetNativeView()->bounds();
-  EXPECT_LT(status_bounds.y(),
-            screen->GetPrimaryDisplay().bounds().bottom());
+  EXPECT_LT(status_bounds.y(), screen->GetPrimaryDisplay().bounds().bottom());
 }
 
 // Makes sure LayoutShelf invoked while animating cleans things up.
 TEST_F(ShelfLayoutManagerTest, LayoutShelfWhileAnimating) {
   Shelf* shelf = GetShelf();
   ShelfLayoutManager* layout_manager = GetShelfLayoutManager();
   // Force an initial layout.
   layout_manager->LayoutShelf();
   EXPECT_EQ(SHELF_VISIBLE, shelf->GetVisibilityState());
 
@@ skipping 44 matching lines @@
       small_change);
 }
 
 // Makes sure the shelf is sized when the status area changes size.
 TEST_F(ShelfLayoutManagerTest, ShelfUpdatedWhenStatusAreaChangesSize) {
   Shelf* shelf = GetShelf();
   ASSERT_TRUE(shelf);
   ShelfWidget* shelf_widget = GetShelfWidget();
   ASSERT_TRUE(shelf_widget);
   ASSERT_TRUE(shelf_widget->status_area_widget());
-  shelf_widget->status_area_widget()->SetBounds(
-      gfx::Rect(0, 0, 200, 200));
+  shelf_widget->status_area_widget()->SetBounds(gfx::Rect(0, 0, 200, 200));
   EXPECT_EQ(200, shelf_widget->GetContentsView()->width() -
-            test::ShelfTestAPI(shelf).shelf_view()->width());
+                     test::ShelfTestAPI(shelf).shelf_view()->width());
 }
 
-
 #if defined(OS_WIN)
 // RootWindow and Display can't resize on Windows Ash. http://crbug.com/165962
 #define MAYBE_AutoHide DISABLED_AutoHide
 #else
 #define MAYBE_AutoHide AutoHide
 #endif
 
 // Various assertions around auto-hide.
 TEST_F(ShelfLayoutManagerTest, MAYBE_AutoHide) {
   aura::Window* root = Shell::GetPrimaryRootWindow();
@@ skipping 188 matching lines @@
   // LayoutShelf() forces the animation to completion, at which point the
   // shelf should go off the screen.
   layout_manager->LayoutShelf();
   EXPECT_EQ(root->bounds().bottom() - kShelfAutoHideSize,
             GetShelfWidget()->GetWindowBoundsInScreen().y());
 
   aura::Window* lock_container = Shell::GetContainer(
       Shell::GetPrimaryRootWindow(), kShellWindowId_LockScreenContainer);
 
   views::Widget* lock_widget = new views::Widget;
-  views::Widget::InitParams lock_params(
-      views::Widget::InitParams::TYPE_WINDOW);
+  views::Widget::InitParams lock_params(views::Widget::InitParams::TYPE_WINDOW);
   lock_params.bounds = gfx::Rect(0, 0, 200, 200);
   params.context = CurrentContext();
   lock_params.parent = lock_container;
   // Widget is now owned by the parent window.
   lock_widget->Init(lock_params);
   lock_widget->Maximize();
   lock_widget->Show();
 
   // Lock the screen.
   LockScreen();
@@ skipping 584 matching lines @@
     return;
 
   UpdateDisplay("800x600,800x600");
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   Shell::RootWindowControllerList root_window_controllers =
       Shell::GetAllRootWindowControllers();
 
   // Create windows on either display.
   aura::Window* window1 = CreateTestWindow();
-  window1->SetBoundsInScreen(
-      gfx::Rect(0, 0, 100, 100),
-      display_manager->GetDisplayAt(0));
+  window1->SetBoundsInScreen(gfx::Rect(0, 0, 100, 100),
+                             display_manager->GetDisplayAt(0));
   window1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
   window1->Show();
 
   aura::Window* window2 = CreateTestWindow();
-  window2->SetBoundsInScreen(
-      gfx::Rect(800, 0, 100, 100),
-      display_manager->GetDisplayAt(1));
+  window2->SetBoundsInScreen(gfx::Rect(800, 0, 100, 100),
+                             display_manager->GetDisplayAt(1));
   window2->Show();
 
   EXPECT_EQ(root_windows[0], window1->GetRootWindow());
   EXPECT_EQ(root_windows[1], window2->GetRootWindow());
 
   wm::GetWindowState(window2)->Activate();
-  EXPECT_EQ(SHELF_HIDDEN,
+  EXPECT_EQ(
+      SHELF_HIDDEN,
       root_window_controllers[0]->GetShelfLayoutManager()->visibility_state());
-  EXPECT_EQ(SHELF_VISIBLE,
+  EXPECT_EQ(
+      SHELF_VISIBLE,
       root_window_controllers[1]->GetShelfLayoutManager()->visibility_state());
 }
 
 // Test for Pinned mode.
 TEST_F(ShelfLayoutManagerTest, PinnedWindowHidesShelf) {
   Shelf* shelf = GetShelf();
 
   aura::Window* window1 = CreateTestWindow();
   window1->SetBounds(gfx::Rect(0, 0, 100, 100));
   window1->Show();
@@ skipping 17 matching lines @@
 // Tests SHELF_ALIGNMENT_(LEFT, RIGHT).
 TEST_F(ShelfLayoutManagerTest, MAYBE_SetAlignment) {
   Shelf* shelf = GetShelf();
   ShelfLayoutManager* layout_manager = GetShelfLayoutManager();
   // Force an initial layout.
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
   layout_manager->LayoutShelf();
   EXPECT_EQ(SHELF_VISIBLE, shelf->GetVisibilityState());
 
   shelf->SetAlignment(SHELF_ALIGNMENT_LEFT);
-  gfx::Rect shelf_bounds(
-      GetShelfWidget()->GetWindowBoundsInScreen());
+  gfx::Rect shelf_bounds(GetShelfWidget()->GetWindowBoundsInScreen());
   const display::Screen* screen = display::Screen::GetScreen();
   display::Display display =
       screen->GetDisplayNearestWindow(Shell::GetPrimaryRootWindow());
   ASSERT_NE(-1, display.id());
   EXPECT_EQ(layout_manager->GetIdealBounds().width(),
             display.GetWorkAreaInsets().left());
-  EXPECT_GE(
-      shelf_bounds.width(),
-      GetShelfWidget()->GetContentsView()->GetPreferredSize().width());
+  EXPECT_GE(shelf_bounds.width(),
+            GetShelfWidget()->GetContentsView()->GetPreferredSize().width());
   EXPECT_EQ(SHELF_ALIGNMENT_LEFT, GetSystemTray()->shelf_alignment());
   StatusAreaWidget* status_area_widget = GetShelfWidget()->status_area_widget();
   gfx::Rect status_bounds(status_area_widget->GetWindowBoundsInScreen());
   EXPECT_GE(status_bounds.width(),
             status_area_widget->GetContentsView()->GetPreferredSize().width());
   EXPECT_EQ(layout_manager->GetIdealBounds().width(),
             display.GetWorkAreaInsets().left());
   EXPECT_EQ(0, display.GetWorkAreaInsets().top());
   EXPECT_EQ(0, display.GetWorkAreaInsets().bottom());
   EXPECT_EQ(0, display.GetWorkAreaInsets().right());
@@ skipping 250 matching lines @@
     // Enable animations so that we can make sure that they occur.
     ui::ScopedAnimationDurationScaleMode regular_animations(
         ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION);
 
     ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
     gfx::Rect shelf_bounds_in_screen =
         GetShelfWidget()->GetWindowBoundsInScreen();
     gfx::Point start(shelf_bounds_in_screen.CenterPoint());
     gfx::Point end(start.x(), shelf_bounds_in_screen.bottom());
     generator.GestureScrollSequence(start, end,
-        base::TimeDelta::FromMilliseconds(10), 5);
+                                    base::TimeDelta::FromMilliseconds(10), 5);
     EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
     EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState());
 
     ShelfAnimationWaiter waiter(visible_bounds);
     // Wait till the animation completes and check that it occurred.
     waiter.WaitTillDoneAnimating();
     EXPECT_TRUE(waiter.WasValidAnimation());
   }
 
   // Create a visible window so auto-hide behavior is enforced.
@@ skipping 10 matching lines @@
         ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION);
 
     gfx::Point start =
         GetShelfWidget()->GetWindowBoundsInScreen().CenterPoint();
     gfx::Point end(start.x(), start.y() - 100);
     ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
 
     // Test that the shelf animates to the visible bounds after a swipe up on
     // the auto hidden shelf.
     generator.GestureScrollSequence(start, end,
-        base::TimeDelta::FromMilliseconds(10), 1);
+                                    base::TimeDelta::FromMilliseconds(10), 1);
     EXPECT_EQ(SHELF_VISIBLE, shelf->GetVisibilityState());
     ShelfAnimationWaiter waiter1(visible_bounds);
     waiter1.WaitTillDoneAnimating();
     EXPECT_TRUE(waiter1.WasValidAnimation());
 
     // Test that the shelf animates to the auto hidden bounds after a swipe up
     // on the visible shelf.
     EXPECT_EQ(SHELF_VISIBLE, shelf->GetVisibilityState());
     generator.GestureScrollSequence(start, end,
-        base::TimeDelta::FromMilliseconds(10), 1);
+                                    base::TimeDelta::FromMilliseconds(10), 1);
     EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
     EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
     ShelfAnimationWaiter waiter2(auto_hidden_bounds);
     waiter2.WaitTillDoneAnimating();
     EXPECT_TRUE(waiter2.WasValidAnimation());
   }
 }
 
 TEST_F(ShelfLayoutManagerTest, ShelfFlickerOnTrayActivation) {
   Shelf* shelf = GetShelf();
@@ skipping 115 matching lines @@
         status_area_widget->GetWindowBoundsInScreen().CenterPoint();
     generator.MoveMouseTo(center.x(), center.y());
     shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
     EXPECT_TRUE(layout_manager->IsVisible());
     if (!i) {
       // In our first iteration we make sure there is no bubble.
       tray->CloseSystemBubble();
       EXPECT_FALSE(status_area_widget->IsMessageBubbleShown());
     } else {
       // In our second iteration we show a bubble.
-      TestItem *item = new TestItem;
+      TestItem* item = new TestItem;
       tray->AddTrayItem(item);
       tray->ShowNotificationView(item);
       EXPECT_TRUE(status_area_widget->IsMessageBubbleShown());
     }
     // Move the pointer over the edge of the shelf.
     generator.MoveMouseTo(
         center.x(), status_area_widget->GetWindowBoundsInScreen().y() - 8);
     layout_manager->UpdateVisibilityState();
     if (i) {
       EXPECT_TRUE(layout_manager->IsVisible());
@@ skipping 56 matching lines @@
 #endif
 
 // Verify the hit bounds of the status area extend to the edge of the shelf.
 TEST_F(ShelfLayoutManagerTest, MAYBE_StatusAreaHitBoxCoversEdge) {
   UpdateDisplay("400x400");
   Shelf* shelf = GetShelf();
   StatusAreaWidget* status_area_widget = Shell::GetPrimaryRootWindowController()
                                              ->shelf_widget()
                                              ->status_area_widget();
   ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
-  generator.MoveMouseTo(399,399);
+  generator.MoveMouseTo(399, 399);
 
   // Test bottom right pixel for bottom alignment.
   EXPECT_FALSE(status_area_widget->IsMessageBubbleShown());
   generator.ClickLeftButton();
   EXPECT_TRUE(status_area_widget->IsMessageBubbleShown());
   generator.ClickLeftButton();
   EXPECT_FALSE(status_area_widget->IsMessageBubbleShown());
 
   // Test bottom right pixel for right alignment.
   shelf->SetAlignment(SHELF_ALIGNMENT_RIGHT);
@@ skipping 11 matching lines @@
   EXPECT_TRUE(status_area_widget->IsMessageBubbleShown());
   generator.ClickLeftButton();
   EXPECT_FALSE(status_area_widget->IsMessageBubbleShown());
 }
 
 // Tests that when the auto-hide behaviour is changed during an animation the
 // target bounds are updated to reflect the new state.
 TEST_F(ShelfLayoutManagerTest,
        ShelfAutoHideToggleDuringAnimationUpdatesBounds) {
   Shelf* shelf = GetShelf();
-  aura::Window* status_window = GetShelfWidget()->status_area_widget()->
-      GetNativeView();
+  aura::Window* status_window =
+      GetShelfWidget()->status_area_widget()->GetNativeView();
   gfx::Rect initial_bounds = status_window->bounds();
 
   ui::ScopedAnimationDurationScaleMode regular_animations(
       ui::ScopedAnimationDurationScaleMode::SLOW_DURATION);
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_ALWAYS_HIDDEN);
-  gfx::Rect hide_target_bounds =  status_window->GetTargetBounds();
+  gfx::Rect hide_target_bounds = status_window->GetTargetBounds();
   EXPECT_GT(hide_target_bounds.y(), initial_bounds.y());
 
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
   gfx::Rect reshow_target_bounds = status_window->GetTargetBounds();
   EXPECT_EQ(initial_bounds, reshow_target_bounds);
 }
 
 // Tests that during shutdown, that window activation changes are properly
 // handled, and do not crash (crbug.com/458768)
 TEST_F(ShelfLayoutManagerTest, ShutdownHandlesWindowActivation) {
@@ skipping 28 matching lines @@
                                              ->shelf_widget()
                                              ->status_area_widget();
   EXPECT_TRUE(status_area_widget->IsVisible());
   // Shelf should be in the first display's area.
   gfx::Rect status_area_bounds(status_area_widget->GetWindowBoundsInScreen());
   EXPECT_TRUE(gfx::Rect(0, 0, 500, 400).Contains(status_area_bounds));
   EXPECT_EQ(gfx::Point(500, 400), status_area_bounds.bottom_right());
 }
 
 }  // namespace ash