Rename GetPreferredSize to CalculatePreferredSize in ash/

ash/test/child_modal_window.cc

Index: ash/test/child_modal_window.cc
diff --git a/ash/test/child_modal_window.cc b/ash/test/child_modal_window.cc
index b9c9c25199ae094f0a8c97cb578beec29db9738f..297ad9abcbd07c2b1ecae0c9a208c487b0a988c2 100644
--- a/ash/test/child_modal_window.cc
+++ b/ash/test/child_modal_window.cc
@@ -63,7 +63,7 @@ class ChildModalWindow : public views::WidgetDelegateView {
  private:
   // Overridden from View:
   void OnPaint(gfx::Canvas* canvas) override;
-  gfx::Size GetPreferredSize() const override;
+  gfx::Size CalculatePreferredSize() const override;
 
   // Overridden from WidgetDelegate:
   base::string16 GetWindowTitle() const override;
@@ -86,7 +86,7 @@ void ChildModalWindow::OnPaint(gfx::Canvas* canvas) {
   canvas->FillRect(GetLocalBounds(), kChildColor);
 }
 
-gfx::Size ChildModalWindow::GetPreferredSize() const {
+gfx::Size ChildModalWindow::CalculatePreferredSize() const {
   return gfx::Size(kChildWindowWidth, kChildWindowHeight);
 }