Revert r169388 "Record stack of the failure in SecondaryDisplayLayout test."

ash/display/display_controller_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/display/display_controller.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/cursor_manager_test_api.h"
-#include "base/debug/stack_trace.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace test {
 namespace {
 
 class TestObserver : public DisplayController::Observer {
  public:
   TestObserver() : count_(0) {
     Shell::GetInstance()->display_controller()->AddObserver(this);
   }
 
   virtual ~TestObserver() {
     Shell::GetInstance()->display_controller()->RemoveObserver(this);
   }
 
   virtual void OnDisplayConfigurationChanging() OVERRIDE {
-    if (!count_)
-      stack_traces_.str(std::string());
-    stack_traces_ << "=========\n";
-    base::debug::StackTrace().OutputToStream(&stack_traces_);
     ++count_;
   }
 
   int CountAndReset() {
     int c = count_;
     count_ = 0;
     return c;
   }
 
-  std::string ToString() {
-    std::string str = stack_traces_.str();
-    stack_traces_.str(std::string());
-    return str;
-  }
-
  private:
   int count_;
-  std::stringstream stack_traces_;
 
   DISALLOW_COPY_AND_ASSIGN(TestObserver);
 };
 
 gfx::Display GetPrimaryDisplay() {
   return Shell::GetScreen()->GetDisplayNearestWindow(
       Shell::GetAllRootWindows()[0]);
 }
 
 gfx::Display GetSecondaryDisplay() {
@@ skipping 30 matching lines @@
 
 typedef test::AshTestBase DisplayControllerTest;
 
 TEST_F(DisplayControllerShutdownTest, Shutdown) {
   UpdateDisplay("444x333, 200x200");
 }
 
 TEST_F(DisplayControllerTest, SecondaryDisplayLayout) {
   TestObserver observer;
   UpdateDisplay("500x500,400x400");
-  EXPECT_EQ(2, observer.CountAndReset())
-      << observer.ToString();  // resize and add
+  EXPECT_EQ(2, observer.CountAndReset());  // resize and add
   gfx::Display* secondary_display =
       Shell::GetInstance()->display_manager()->GetDisplayAt(1);
   gfx::Insets insets(5, 5, 5, 5);
   secondary_display->UpdateWorkAreaFromInsets(insets);
 
   // Default layout is RIGHT.
-  EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString())
-      << observer.ToString();
-  EXPECT_EQ("500,0 400x400", GetSecondaryDisplay().bounds().ToString())
-      << observer.ToString();
-  EXPECT_EQ("505,5 390x390", GetSecondaryDisplay().work_area().ToString())
-      << observer.ToString();
+  EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
+  EXPECT_EQ("500,0 400x400", GetSecondaryDisplay().bounds().ToString());
+  EXPECT_EQ("505,5 390x390", GetSecondaryDisplay().work_area().ToString());
 
   // Layout the secondary display to the bottom of the primary.
   SetSecondaryDisplayLayout(DisplayLayout::BOTTOM);
-  EXPECT_EQ(1, observer.CountAndReset())
-      << observer.ToString();
-  EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString())
-      << observer.ToString();
-  EXPECT_EQ("0,500 400x400", GetSecondaryDisplay().bounds().ToString())
-      << observer.ToString();
-  EXPECT_EQ("5,505 390x390", GetSecondaryDisplay().work_area().ToString())
-      << observer.ToString();
+  EXPECT_EQ(1, observer.CountAndReset());
+  EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
+  EXPECT_EQ("0,500 400x400", GetSecondaryDisplay().bounds().ToString());
+  EXPECT_EQ("5,505 390x390", GetSecondaryDisplay().work_area().ToString());
 
   // Layout the secondary display to the left of the primary.
   SetSecondaryDisplayLayout(DisplayLayout::LEFT);
-  EXPECT_EQ(1, observer.CountAndReset())
-      << observer.ToString();
-  EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString())
-      << observer.ToString();
-  EXPECT_EQ("-400,0 400x400", GetSecondaryDisplay().bounds().ToString())
-      << observer.ToString();
-  EXPECT_EQ("-395,5 390x390", GetSecondaryDisplay().work_area().ToString())
-      << observer.ToString();
+  EXPECT_EQ(1, observer.CountAndReset());
+  EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
+  EXPECT_EQ("-400,0 400x400", GetSecondaryDisplay().bounds().ToString());
+  EXPECT_EQ("-395,5 390x390", GetSecondaryDisplay().work_area().ToString());
 
   // Layout the secondary display to the top of the primary.
   SetSecondaryDisplayLayout(DisplayLayout::TOP);
-  EXPECT_EQ(1, observer.CountAndReset())
-      << observer.ToString();
-  EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString())
-      << observer.ToString();
-  EXPECT_EQ("0,-400 400x400", GetSecondaryDisplay().bounds().ToString())
-      << observer.ToString();
-  EXPECT_EQ("5,-395 390x390", GetSecondaryDisplay().work_area().ToString())
-      << observer.ToString();
+  EXPECT_EQ(1, observer.CountAndReset());
+  EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
+  EXPECT_EQ("0,-400 400x400", GetSecondaryDisplay().bounds().ToString());
+  EXPECT_EQ("5,-395 390x390", GetSecondaryDisplay().work_area().ToString());
 
   // Layout to the right with an offset.
   SetSecondaryDisplayLayoutAndOffset(DisplayLayout::RIGHT, 300);
-  EXPECT_EQ(1, observer.CountAndReset())
-      << observer.ToString();
-  EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString())
-      << observer.ToString();
-  EXPECT_EQ("500,300 400x400", GetSecondaryDisplay().bounds().ToString())
-      << observer.ToString();
+  EXPECT_EQ(1, observer.CountAndReset());  // resize and add
+  EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
+  EXPECT_EQ("500,300 400x400", GetSecondaryDisplay().bounds().ToString());
 
   // Keep the minimum 100.
   SetSecondaryDisplayLayoutAndOffset(DisplayLayout::RIGHT, 490);
-  EXPECT_EQ(1, observer.CountAndReset())
-      << observer.ToString();
-  EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString())
-      << observer.ToString();
-  EXPECT_EQ("500,400 400x400", GetSecondaryDisplay().bounds().ToString())
-      << observer.ToString();
+  EXPECT_EQ(1, observer.CountAndReset());  // resize and add
+  EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
+  EXPECT_EQ("500,400 400x400", GetSecondaryDisplay().bounds().ToString());
 
   SetSecondaryDisplayLayoutAndOffset(DisplayLayout::RIGHT, -400);
-  EXPECT_EQ(1, observer.CountAndReset())
-      << observer.ToString();
-  EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString())
-      << observer.ToString();
-  EXPECT_EQ("500,-300 400x400", GetSecondaryDisplay().bounds().ToString())
-      << observer.ToString();
+  EXPECT_EQ(1, observer.CountAndReset());  // resize and add
+  EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
+  EXPECT_EQ("500,-300 400x400", GetSecondaryDisplay().bounds().ToString());
 
   //  Layout to the bottom with an offset.
   SetSecondaryDisplayLayoutAndOffset(DisplayLayout::BOTTOM, -200);
-  EXPECT_EQ(1, observer.CountAndReset())
-      << observer.ToString();
-  EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString())
-      << observer.ToString();
-  EXPECT_EQ("-200,500 400x400", GetSecondaryDisplay().bounds().ToString())
-      << observer.ToString();
+  EXPECT_EQ(1, observer.CountAndReset());  // resize and add
+  EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
+  EXPECT_EQ("-200,500 400x400", GetSecondaryDisplay().bounds().ToString());
 
   // Keep the minimum 100.
   SetSecondaryDisplayLayoutAndOffset(DisplayLayout::BOTTOM, 490);
-  EXPECT_EQ(1, observer.CountAndReset())
-      << observer.ToString();
-  EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString())
-      << observer.ToString();
-  EXPECT_EQ("400,500 400x400", GetSecondaryDisplay().bounds().ToString())
-      << observer.ToString();
+  EXPECT_EQ(1, observer.CountAndReset());  // resize and add
+  EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
+  EXPECT_EQ("400,500 400x400", GetSecondaryDisplay().bounds().ToString());
 
   SetSecondaryDisplayLayoutAndOffset(DisplayLayout::BOTTOM, -400);
-  EXPECT_EQ(1, observer.CountAndReset())
-      << observer.ToString();
-  EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString())
-      << observer.ToString();
-  EXPECT_EQ("-300,500 400x400", GetSecondaryDisplay().bounds().ToString())
-      << observer.ToString();
+  EXPECT_EQ(1, observer.CountAndReset());  // resize and add
+  EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
+  EXPECT_EQ("-300,500 400x400", GetSecondaryDisplay().bounds().ToString());
 
 }
 
 TEST_F(DisplayControllerTest, BoundsUpdated) {
   TestObserver observer;
   SetSecondaryDisplayLayout(DisplayLayout::BOTTOM);
   UpdateDisplay("200x200,300x300");  // layout, resize and add.
   EXPECT_EQ(3, observer.CountAndReset());
 
   gfx::Display* secondary_display =
@@ skipping 350 matching lines @@
   UpdateDisplay("100+200-100x200,300+500-200x300");
   ASSERT_EQ(2, Shell::GetScreen()->GetNumDisplays());
   EXPECT_EQ("100,200", root_windows[0]->GetHostOrigin().ToString());
   EXPECT_EQ("100x200", root_windows[0]->GetHostSize().ToString());
   EXPECT_EQ("300,500", root_windows[1]->GetHostOrigin().ToString());
   EXPECT_EQ("200x300", root_windows[1]->GetHostSize().ToString());
 }
 
 }  // namespace test
 }  // namespace ash