Use bounds instead of size for prerender requests

chrome/browser/prerender/prerender_contents.cc

Index: chrome/browser/prerender/prerender_contents.cc
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index 18f221b42f3f1401325efad0b7a540ea868b8f59..13be5974df3df6bd0b1eadee79530191e643213f 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -169,7 +169,7 @@ class PrerenderContents::WebContentsDelegateImpl
   gfx::Size GetSizeForNewRenderView(WebContents* web_contents) const override {
     // Have to set the size of the RenderView on initialization to be sure it is
     // set before the RenderView is hidden on all platforms (esp. Android).
-    return prerender_contents_->size_;
+    return prerender_contents_->bounds_.size();
   }
 
  private:
@@ -235,17 +235,16 @@ PrerenderContents* PrerenderContents::FromWebContents(
 }
 
 void PrerenderContents::StartPrerendering(
-    const gfx::Size& size,
+    const gfx::Rect& bounds,
     SessionStorageNamespace* session_storage_namespace) {
   DCHECK(profile_);
-  DCHECK(!size.IsEmpty());
+  DCHECK(!bounds.IsEmpty());

[Benoit L, 2016/08/19 12:49:49]

Isn't this going to be hit by the test in ExternalPrerenderHandlerTest.java:118?

(or at least create some flakiness if there is a race).

[Yusuf, 2016/08/19 17:20:33]

Actually, before prerender_manager calls this, we always check whether the one
sent to addPrerender is empty and set to default_bounds_ if it is. So by the
time we are here, it is always non-empty.

   DCHECK(!prerendering_has_started_);
   DCHECK(!prerender_contents_);
-  DCHECK(size_.IsEmpty());
   DCHECK_EQ(1U, alias_urls_.size());
 
   session_storage_namespace_id_ = session_storage_namespace->id();
-  size_ = size;
+  bounds_ = bounds;
 
   DCHECK(load_start_time_.is_null());
   load_start_time_ = base::TimeTicks::Now();
@@ -270,7 +269,7 @@ void PrerenderContents::StartPrerendering(
   web_contents_delegate_.reset(new WebContentsDelegateImpl(this));
   prerender_contents_.get()->SetDelegate(web_contents_delegate_.get());
   // Set the size of the prerender WebContents.
-  ResizeWebContents(prerender_contents_.get(), size_);
+  ResizeWebContents(prerender_contents_.get(), bounds_);
 
   // TODO(davidben): This logic assumes each prerender has at most one
   // route. https://crbug.com/440544