Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f
diff --git a/printing/printing_context_win_unittest.cc b/printing/printing_context_win_unittest.cc
index 2251e64..5c6d166 100644
--- a/printing/printing_context_win_unittest.cc
+++ b/printing/printing_context_win_unittest.cc
@@ -50,7 +50,7 @@
   if (!OpenPrinter(const_cast<wchar_t*>(printer_name.c_str()), &printer, NULL))
     return E_FAIL;
 
-  scoped_array<uint8> buffer;
+  scoped_ptr<uint8[]> buffer;
   const DEVMODE* dev_mode = NULL;
   HRESULT result = S_OK;
   lppd->hDC = NULL;