Cleanup: Update the path to gfx size headers.

The geometry headers were moved from /ui/gfx/ to ui/gfx/geometry, so
we are updating the include paths to fix this.

BUG=395370
TEST=compiles
TBR=sky@chromium.org,danakj@chromium.org

Review URL: https://codereview.chromium.org/832953002

Cr-Commit-Position: refs/heads/master@{#309873}

12 files changed, 12 insertions, 12 deletions

diff --git a/components/constrained_window/constrained_window_views_unittest.cc b/components/constrained_window/constrained_window_views_unittest.cc
index 9e7c9d6..645e559 100644
--- a/components/constrained_window/constrained_window_views_unittest.cc
+++ b/components/constrained_window/constrained_window_views_unittest.cc
@@ -7,8 +7,8 @@
 #include "components/web_modal/test_web_contents_modal_dialog_host.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
-#include "ui/gfx/size.h"
 #include "ui/views/border.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
diff --git a/components/dom_distiller/core/distiller_page.h b/components/dom_distiller/core/distiller_page.h
index 7119f0d0..74cf277 100644
--- a/components/dom_distiller/core/distiller_page.h
+++ b/components/dom_distiller/core/distiller_page.h
@@ -12,7 +12,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "third_party/dom_distiller_js/dom_distiller.pb.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/size.h"
 #include "url/gurl.h"
 
 namespace dom_distiller {
diff --git a/components/dom_distiller/core/viewer.h b/components/dom_distiller/core/viewer.h
index 45b7e95..9e1ded3 100644
--- a/components/dom_distiller/core/viewer.h
+++ b/components/dom_distiller/core/viewer.h
@@ -12,7 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "components/dom_distiller/core/distilled_page_prefs.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace dom_distiller {
 
diff --git a/components/favicon_base/favicon_types.h b/components/favicon_base/favicon_types.h
index f99f038..ea64754 100644
--- a/components/favicon_base/favicon_types.h
+++ b/components/favicon_base/favicon_types.h
@@ -6,8 +6,8 @@
 #define COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_
 
 #include "base/memory/ref_counted_memory.h"
+#include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image.h"
-#include "ui/gfx/size.h"
 #include "url/gurl.h"
 
 namespace favicon_base {
diff --git a/components/favicon_base/favicon_util.cc b/components/favicon_base/favicon_util.cc
index af547f3..dea071f 100644
--- a/components/favicon_base/favicon_util.cc
+++ b/components/favicon_base/favicon_util.cc
@@ -14,9 +14,9 @@
 #include "ui/base/layout.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/favicon_size.h"
+#include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image_png_rep.h"
 #include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/size.h"
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 #include "base/mac/mac_util.h"
diff --git a/components/favicon_base/select_favicon_frames.cc b/components/favicon_base/select_favicon_frames.cc
index 492d211..1a1e526 100644
--- a/components/favicon_base/select_favicon_frames.cc
+++ b/components/favicon_base/select_favicon_frames.cc
@@ -13,10 +13,10 @@
 #include "components/favicon_base/favicon_util.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_source.h"
-#include "ui/gfx/size.h"
 
 namespace {
 
diff --git a/components/history/core/browser/history_types.h b/components/history/core/browser/history_types.h
index a5c8fe5..6f3864b 100644
--- a/components/history/core/browser/history_types.h
+++ b/components/history/core/browser/history_types.h
@@ -21,7 +21,7 @@
 #include "components/history/core/browser/url_row.h"
 #include "components/history/core/common/thumbnail_score.h"
 #include "ui/base/page_transition_types.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/size.h"
 #include "url/gurl.h"
 
 class PageUsageData;
diff --git a/components/infobars/core/infobar.h b/components/infobars/core/infobar.h
index 8c1284a..ebced9f 100644
--- a/components/infobars/core/infobar.h
+++ b/components/infobars/core/infobar.h
@@ -12,7 +12,7 @@
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/animation/slide_animation.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace infobars {
 
diff --git a/components/metrics/gpu/gpu_metrics_provider.h b/components/metrics/gpu/gpu_metrics_provider.h
index 06bbba3..4ca2a96 100644
--- a/components/metrics/gpu/gpu_metrics_provider.h
+++ b/components/metrics/gpu/gpu_metrics_provider.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "components/metrics/metrics_provider.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace metrics {
 
diff --git a/components/metrics/gpu/gpu_metrics_provider_unittest.cc b/components/metrics/gpu/gpu_metrics_provider_unittest.cc
index 931b731..83d345d 100644
--- a/components/metrics/gpu/gpu_metrics_provider_unittest.cc
+++ b/components/metrics/gpu/gpu_metrics_provider_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/basictypes.h"
 #include "components/metrics/proto/chrome_user_metrics_extension.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace metrics {
 
diff --git a/components/wallpaper/wallpaper_resizer.h b/components/wallpaper/wallpaper_resizer.h
index 0fac55a..a7ec1f0 100644
--- a/components/wallpaper/wallpaper_resizer.h
+++ b/components/wallpaper/wallpaper_resizer.h
@@ -12,8 +12,8 @@
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/size.h"
 
 namespace base {
 class SequencedWorkerPool;
diff --git a/components/web_modal/test_web_contents_modal_dialog_host.h b/components/web_modal/test_web_contents_modal_dialog_host.h
index 1ba4d13..28c7c2f 100644
--- a/components/web_modal/test_web_contents_modal_dialog_host.h
+++ b/components/web_modal/test_web_contents_modal_dialog_host.h
@@ -9,8 +9,8 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
-#include "ui/gfx/size.h"
 
 namespace web_modal {