Fix saved screenshots for feedback.

chrome/browser/ui/webui/bug_report_ui.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/ui/webui/bug_report_ui.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/logging.h"
@@ skipping 35 matching lines @@
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/system/syslogs_provider.h"
 #endif
 
 namespace {
 
 const char kScreenshotBaseUrl[] = "chrome://screenshots/";
 const char kCurrentScreenshotUrl[] = "chrome://screenshots/current";
 #if defined(OS_CHROMEOS)
 const char kSavedScreenshotsUrl[] = "chrome://screenshots/saved/";
-
-const char kScreenshotPattern[] = "*.png";
-const char kScreenshotsRelativePath[] = "/Screenshots";
+const char kScreenshotPattern[] = "screenshot-*.png";
 
 const size_t kMaxSavedScreenshots = 2;
 #endif
 
 #if defined(OS_CHROMEOS)
 
 void GetSavedScreenshots(std::vector<std::string>* saved_screenshots,
                          base::WaitableEvent* done) {
   saved_screenshots->clear();
 
   FilePath fileshelf_path;
   if (!PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS,
                         &fileshelf_path)) {
     done->Signal();
     return;
   }
 
-  // TODO(rkc): Change this to use FilePath.Append() once the cros
-  // issue with it is fixed
-  FilePath screenshots_path(fileshelf_path.value() +
-                            std::string(kScreenshotsRelativePath));
-  file_util::FileEnumerator screenshots(screenshots_path, false,
+  file_util::FileEnumerator screenshots(fileshelf_path, false,
                                         file_util::FileEnumerator::FILES,
                                         std::string(kScreenshotPattern));
   FilePath screenshot = screenshots.Next();
   while (!screenshot.empty()) {
     saved_screenshots->push_back(std::string(kSavedScreenshotsUrl) +
                                  screenshot.BaseName().value());
     if (saved_screenshots->size() >= kMaxSavedScreenshots)
       break;
 
     screenshot = screenshots.Next();
@@ skipping 415 matching lines @@
     LOG(ERROR) << "Incorrect data passed to sendReport.";
     return;
   }
 
   // #3 -  Screenshot to send.
   std::string screenshot_path;
   (*i)->GetAsString(&screenshot_path);
   screenshot_path.erase(0, strlen(kScreenshotBaseUrl));
 
   // Get the image to send in the report.
-  std::vector<unsigned char> image;
+  ScreenshotDataPtr image_ptr;
   if (!screenshot_path.empty())
-    image = screenshot_source_->GetScreenshot(screenshot_path);
+    image_ptr = screenshot_source_->GetCachedScreenshot(screenshot_path);
 
 #if defined(OS_CHROMEOS)
   if (++i == list_value->end()) {
     LOG(ERROR) << "Incorrect data passed to sendReport.";
     return;
   }
 
   // #4 - User e-mail
   std::string user_email;
   (*i)->GetAsString(&user_email);
@@ skipping 11 matching lines @@
   if (!send_sys_info)
     CancelFeedbackCollection();
 #endif
 
   // Update the data in bug_report_data_ so it can be sent
   bug_report_data_->UpdateData(Profile::FromWebUI(web_ui_)
                                , target_tab_url_
                                , problem_type
                                , page_url
                                , description
-                               , image
+                               , image_ptr
 #if defined(OS_CHROMEOS)
                                , user_email
                                , send_sys_info
                                , false // sent_report
 #endif
                                );
 
 #if defined(OS_CHROMEOS)
   // If we don't require sys_info, or we have it, or we never requested it
   // (because libcros failed to load), then send the report now.
@@ skipping 57 matching lines @@
   AddMessageHandler((handler)->Attach(this));
 
   // The handler's init will determine whether we show the error html page.
   ChromeWebUIDataSource* html_source =
       CreateBugReportUIHTMLSource(handler->Init());
 
   // Set up the chrome://bugreport/ source.
   Profile* profile = Profile::FromBrowserContext(tab->browser_context());
   profile->GetChromeURLDataManager()->AddDataSource(html_source);
 }