Fix saved screenshots for feedback.

chrome/browser/bug_report_util.cc

 // Copyright (c) 2011 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 "chrome/browser/bug_report_util.h"
 
 #include <sstream>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 235 matching lines @@
   return true;
 }
 #endif
 
 // static
 void BugReportUtil::SendReport(
     Profile* profile
     , int problem_type
     , const std::string& page_url_text
     , const std::string& description
-    , const char* png_data
-    , int png_data_length
+    , ScreenshotDataPtr image_data_ptr
     , int png_width
     , int png_height
 #if defined(OS_CHROMEOS)
     , const std::string& user_email_text
     , const char* zipped_logs_data
     , int zipped_logs_length
     , const chromeos::system::LogDictionaryType* const sys_info
 #endif
     ) {
   // Create google feedback protocol buffer objects
@@ skipping 34 matching lines @@
     AddFeedbackData(&feedback_data, std::string(kChromeVersionTag),
                     chrome_version);
   }
 
   // Add OS version (eg, for WinXP SP2: "5.1.2600 Service Pack 2").
   std::string os_version = "";
   SetOSVersion(&os_version);
   AddFeedbackData(&feedback_data, std::string(kOsVersionTag), os_version);
 
   // Include the page image if we have one.
-  if (png_data) {
+  if (image_data_ptr.get() && image_data_ptr->size()) {
     userfeedback::PostedScreenshot screenshot;
     screenshot.set_mime_type(kPngMimeType);
     // Set the dimensions of the screenshot
     userfeedback::Dimensions dimensions;
     dimensions.set_width(static_cast<float>(png_width));
     dimensions.set_height(static_cast<float>(png_height));
     *(screenshot.mutable_dimensions()) = dimensions;
-    screenshot.set_binary_content(std::string(png_data, png_data_length));
+
+    int image_data_size = image_data_ptr->size();
+    char* image_data = reinterpret_cast<char*>(&(image_data_ptr->front()));
+    screenshot.set_binary_content(std::string(image_data, image_data_size));
 
     // Set the screenshot object in feedback
     *(feedback_data.mutable_screenshot()) = screenshot;
   }
 
 #if defined(OS_CHROMEOS)
   if (sys_info) {
     // Add the product specific data
     for (chromeos::system::LogDictionaryType::const_iterator i =
              sys_info->begin(); i != sys_info->end(); ++i) {
@@ skipping 77 matching lines @@
   if (screenshot_size == NULL)
     screenshot_size = new gfx::Rect();
   return *screenshot_size;
 }
 
 // static
 void BugReportUtil::SetScreenshotSize(const gfx::Rect& rect) {
   gfx::Rect& screen_size = GetScreenshotSize();
   screen_size = rect;
 }