Pass device scale factor from display to ws.

ui/base/resource/resource_bundle.cc

 // Copyright (c) 2012 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 "ui/base/resource/resource_bundle.h"
 
 #include <stdint.h>
 
 #include <limits>
 #include <utility>
@@ skipping 119 matching lines @@
     SkBitmap image;
     bool fell_back_to_1x = false;
     ScaleFactor scale_factor = GetSupportedScaleFactor(scale);
     bool found = rb_->LoadBitmap(resource_id_, &scale_factor,
                                  &image, &fell_back_to_1x);
     if (!found) {
 #if defined(OS_ANDROID)
       // TODO(oshima): Android unit_tests runs at DSF=3 with 100P assets.
       return gfx::ImageSkiaRep();
 #else
-      NOTREACHED() << "Unable to load image with id " << resource_id_
-                   << ", scale=" << scale;
-      return gfx::ImageSkiaRep(CreateEmptyBitmap(), scale);
+// TODO: Remove before submitting.

[rjkroege, 2016/09/21 13:23:47]

please complete TODO

[kylechar, 2016/09/22 20:03:27]

Done.

+//      NOTREACHED() << "Unable to load image with id " << resource_id_
+//                   << ", scale=" << scale;
+//      return gfx::ImageSkiaRep(CreateEmptyBitmap(), scale);
 #endif
     }
 
     // If the resource is in the package with SCALE_FACTOR_NONE, it
     // can be used in any scale factor. The image is maked as "unscaled"
     // so that the ImageSkia do not automatically scale.
     if (scale_factor == ui::SCALE_FACTOR_NONE)
       return gfx::ImageSkiaRep(image, 0.0f);
 
     if (fell_back_to_1x) {
@@ skipping 748 matching lines @@
 // static
 bool ResourceBundle::DecodePNG(const unsigned char* buf,
                                size_t size,
                                SkBitmap* bitmap,
                                bool* fell_back_to_1x) {
   *fell_back_to_1x = PNGContainsFallbackMarker(buf, size);
   return gfx::PNGCodec::Decode(buf, size, bitmap);
 }
 
 }  // namespace ui