Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / ui / gfx / icon_util.cc

diff --git a/src/ui/gfx/icon_util.cc b/src/ui/gfx/icon_util.cc
index 70e63c4..45d688b 100644 (file)
--- a/src/ui/gfx/icon_util.cc
+++ b/src/ui/gfx/icon_util.cc
@@ -4,7 +4,7 @@
 
 #include "ui/gfx/icon_util.h"
 
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/files/important_file_writer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ -348,9 +348,9 @@ HICON IconUtil::CreateCursorFromDIB(const gfx::Size& icon_size,
   }
 
   HBITMAP old_bitmap = reinterpret_cast<HBITMAP>(
-      SelectObject(working_dc, bitmap_handle));
-  SetBkMode(working_dc, TRANSPARENT);
-  SelectObject(working_dc, old_bitmap);
+      SelectObject(working_dc.Get(), bitmap_handle));
+  SetBkMode(working_dc.Get(), TRANSPARENT);
+  SelectObject(working_dc.Get(), old_bitmap);
 
   base::win::ScopedGDIObject<HBITMAP> mask(
       CreateBitmap(icon_size.width(),