Get rid of implicit conversion to and from ImageSkiaRep

ui/gfx/image/image_skia.cc

Index: ui/gfx/image/image_skia.cc
diff --git a/ui/gfx/image/image_skia.cc b/ui/gfx/image/image_skia.cc
index 3d8acf135fb0b991938abca1660b94229af48897..9472cda8b6be4d26c4bc42e63e0a893e4536ff34 100644
--- a/ui/gfx/image/image_skia.cc
+++ b/ui/gfx/image/image_skia.cc
@@ -141,7 +141,7 @@ ImageSkia::ImageSkia(ImageSkiaSource* source, const gfx::Size& size)
 }
 
 ImageSkia::ImageSkia(const SkBitmap& bitmap) {
-  Init(ImageSkiaRep(bitmap));
+  Init(ImageSkiaRep(bitmap, ui::SCALE_FACTOR_100P));
 }
 
 ImageSkia::ImageSkia(const ImageSkiaRep& image_rep) {
@@ -157,12 +157,7 @@ ImageSkia& ImageSkia::operator=(const ImageSkia& other) {
 }
 
 ImageSkia& ImageSkia::operator=(const SkBitmap& other) {
-  Init(ImageSkiaRep(other));
-  return *this;
-}
-
-ImageSkia& ImageSkia::operator=(const ImageSkiaRep& other) {
-  Init(other);
+  Init(ImageSkiaRep(other, ui::SCALE_FACTOR_100P));
   return *this;
 }
 
@@ -173,13 +168,6 @@ ImageSkia::operator SkBitmap&() const {
   return const_cast<SkBitmap&>(storage_->image_reps()[0].sk_bitmap());
 }
 
-ImageSkia::operator ImageSkiaRep&() const {
-  if (isNull())
-    return NullImageRep();
-
-  return storage_->image_reps()[0];
-}
-
 ImageSkia::~ImageSkia() {
 }