views: Move grid_layout files into layout directory. Final Part.

views/layout/grid_layout_unittest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "testing/gtest/include/gtest/gtest.h"
-#include "views/grid_layout.h"
+#include "views/layout/grid_layout.h"
 #include "views/view.h"
 
 using views::ColumnSet;
 using views::GridLayout;
 using views::View;
 
 static void ExpectViewBoundsEquals(int x, int y, int w, int h,
                                    const View* view) {
   EXPECT_EQ(x, view->x());
   EXPECT_EQ(y, view->y());
@@ skipping 582 matching lines @@
   // ordering doesn't influence sizing behaviour.
   layout->StartRow(0, 2);
   View* view3 = new FlexibleView(40);
   layout->AddView(view3, 1, 1, GridLayout::FILL, GridLayout::LEADING);
 
   // We expect a height of 50: 30 from the variable width view in the first row
   // plus 20 from the statically sized view in the second row. The flexible
   // view in the third row should contribute no height.
   EXPECT_EQ(gfx::Size(20, 50), layout->GetPreferredSize(&host));
 }