Merge 182499

chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm

Index: chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm
===================================================================
--- chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm	(revision 182776)
+++ chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm	(working copy)
@@ -107,4 +107,10 @@
 
   EXPECT_EQ(height - offset, NSHeight([web_view bounds]));
   EXPECT_EQ(0, NSMinY([web_view bounds]));
+
+  // Update the offset and verify that the view is resized.
+  CGFloat new_offset = 25;
+  [controller() setTopContentOffset:new_offset];
+  EXPECT_EQ(height - new_offset, NSHeight([web_view bounds]));
+  EXPECT_EQ(0, NSMinY([web_view bounds]));
 }