rebaseline huge-image-viewport-scale.html

This test was not being run with correctly initialized
preferences, and an invalid baseline.  This fixes the
initialization, and rebaselines the test.

This is a prerequisite of https://codereview.chromium.org/2155273002/

BUG=331654, 464295

Review-Url: https://codereview.chromium.org/2163953002
Cr-Commit-Position: refs/heads/master@{#406679}

content/browser/renderer_host/render_widget_host_view_aura.cc

@@ -491,6 +491,13 @@ RenderWidgetHostViewAura::RenderWidgetHostViewAura(RenderWidgetHost* host,
   selection_controller_client_.reset(
       new TouchSelectionControllerClientAura(this));
   CreateSelectionController();
+
+  RenderViewHost* rvh = RenderViewHost::From(host_);
+  if (rvh) {
+    // TODO(mostynb): actually use prefs.  Landing this as a separate CL
+    // first to rebaseline some unreliable layout tests.
+    ignore_result(rvh->GetWebkitPreferences());
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////

content/browser/renderer_host/render_widget_host_view_mac.mm

@@ -18,8 +18,9 @@
 #include "base/debug/crash_logging.h"
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
-#import "base/mac/scoped_nsobject.h"
 #include "base/mac/sdk_forward_declarations.h"
+#include "base/macros.h"
+#import "base/mac/scoped_nsobject.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/histogram.h"
 #include "base/numerics/safe_conversions.h"
@@ -521,6 +522,13 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget,
         ->GetInputEventRouter()
         ->AddSurfaceClientIdOwner(GetSurfaceClientId(), this);
   }
+
+  RenderViewHost* rvh = RenderViewHost::From(render_widget_host_);
+  if (rvh) {
+    // TODO(mostynb): actually use prefs.  Landing this as a separate CL
+    // first to rebaseline some unreliable layout tests.
+    ignore_result(rvh->GetWebkitPreferences());
+  }
 }
 
 RenderWidgetHostViewMac::~RenderWidgetHostViewMac() {

third_party/WebKit/LayoutTests/fast/images/huge-image-viewport-scale-expected.txt

@@ -3,5 +3,5 @@ To manual test, open resources/5000x5000.png in a viewport-capable browser (e.g.
 Passes if the image shinks to fit the width.
 
 viewport meta: <meta name="viewport" content="width=device-width, minimum-scale=0.1">
-image style: -webkit-user-select: none; max-width: 1000px;
-image actual width: 1000
+image style: -webkit-user-select: none; cursor: zoom-in;
+image actual width: 100