Fix references to ui/gfx headers in a*/.

ash/magnifier/magnification_controller_unittest.cc

 // Copyright (c) 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 "ash/magnifier/magnification_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/strings/stringprintf.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/aura_test_utils.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/chromeos/accessibility_types.h"
 #include "ui/events/test/event_generator.h"
-#include "ui/gfx/rect_conversions.h"
+#include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 namespace ash {
 namespace {
 
@@ skipping 550 matching lines @@
   gfx::Rect caret_bounds = GetCaretBounds();
   EXPECT_FALSE(view_port.Intersects(caret_bounds));
 
   gfx::Rect new_view_port = GetViewport();
   EXPECT_TRUE(new_view_port.Contains(caret_bounds));
   EXPECT_EQ(caret_bounds.x(), new_view_port.CenterPoint().x());
   EXPECT_EQ(view_port.y(), new_view_port.y());
 }
 
 }  // namespace ash