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

athena/content/content_proxy_browsertest.cc

 // Copyright 2014 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 "athena/activity/public/activity.h"
 #include "athena/activity/public/activity_view_model.h"
 #include "athena/resource_manager/public/resource_manager.h"
 #include "athena/test/base/test_util.h"
 #include "athena/test/chrome/athena_chrome_browser_test.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/compositor/compositor_switches.h"
+#include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/size.h"
 #include "url/gurl.h"
 
 namespace athena {
 
 namespace {
 // The test URL to navigate to.
 const char kTestUrl[] = "chrome:about";
 
 const int kTimeoutMS = 12000;  // The timeout: 2 seconds.
 const int kIterationSleepMS = 5;  // The wait time in ms per iteration.
@@ skipping 109 matching lines @@
   activity1->SetCurrentState(Activity::ACTIVITY_VISIBLE);
   test_util::WaitUntilIdle();
   DCHECK_EQ(activity1->GetCurrentState(), Activity::ACTIVITY_VISIBLE);
 
   DCHECK_EQ(activity1->GetActivityViewModel()->GetOverviewModeImage()
                 .size().ToString(),
             gfx::Size().ToString());
 }
 
 }  // namespace athena