Fix feedback log collection.

chrome/browser/ui/webui/feedback_ui.cc

 // Copyright (c) 2012 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/feedback_ui.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 47 matching lines @@
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
 #include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #include "chrome/browser/chromeos/drive/drive_system_service.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/chromeos/system/syslogs_provider.h"
+#include "chrome/browser/chromeos/system_logs/system_logs_fetcher.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #endif
 
 using content::BrowserThread;
 using content::WebContents;
 using content::WebUIMessageHandler;
 using ui::WebDialogUI;
 
 namespace {
@@ skipping 180 matching lines @@
   void HandleGetDialogDefaults(const ListValue* args);
   void HandleRefreshCurrentScreenshot(const ListValue* args);
 #if defined(OS_CHROMEOS)
   void HandleRefreshSavedScreenshots(const ListValue* args);
   void RefreshSavedScreenshotsCallback(
       std::vector<std::string>* saved_screenshots);
   void GetMostRecentScreenshotsDrive(
       const base::FilePath& filepath,
       std::vector<std::string>* saved_screenshots,
       size_t max_saved, base::Closure callback);
+  void StartSyslogsCollection();
 #endif
   void HandleSendReport(const ListValue* args);
   void HandleCancel(const ListValue* args);
   void HandleOpenSystemTab(const ListValue* args);
 
   void SetupScreenshotsSource();
   void ClobberScreenshotsSource();
 
-  void CancelFeedbackCollection();
   void CloseFeedbackTab();
 
   WebContents* tab_;
   ScreenshotSource* screenshot_source_;
 
-  FeedbackData* feedback_data_;
+  scoped_refptr<FeedbackData> feedback_data_;
   std::string target_tab_url_;
 #if defined(OS_CHROMEOS)
-  // Variables to track SyslogsProvider::RequestSyslogs.
-  CancelableTaskTracker::TaskId syslogs_task_id_;
-  CancelableTaskTracker syslogs_tracker_;
-
   // Timestamp of when the feedback request was initiated.
   std::string timestamp_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(FeedbackHandler);
 };
 
 content::WebUIDataSource* CreateFeedbackUIHTMLSource(bool successful_init) {
   content::WebUIDataSource* source =
       content::WebUIDataSource::Create(chrome::kChromeUIFeedbackHost);
@@ skipping 51 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // FeedbackHandler
 //
 ////////////////////////////////////////////////////////////////////////////////
 FeedbackHandler::FeedbackHandler(WebContents* tab)
     : tab_(tab),
       screenshot_source_(NULL),
-      feedback_data_(NULL)
-#if defined(OS_CHROMEOS)
-      , syslogs_task_id_(CancelableTaskTracker::kBadTaskId)
-#endif
-{}
+      feedback_data_(NULL) {
+  DCHECK(tab);
+}
 
 FeedbackHandler::~FeedbackHandler() {
-  // Just in case we didn't send off feedback_data_ to SendReport
-  if (feedback_data_) {
-    // If we're deleting the report object, cancel feedback collection first
-    CancelFeedbackCollection();
-    delete feedback_data_;
-  }
   // Make sure we don't leave any screenshot data around.
   FeedbackUtil::ClearScreenshotPng();
 }
 
 void FeedbackHandler::ClobberScreenshotsSource() {
   // Re-create our screenshots data source (this clobbers the last source)
   // setting the screenshot to NULL, effectively disabling the source
   // TODO(rkc): Once there is a method to 'remove' a source, change this code
   Profile* profile = Profile::FromBrowserContext(tab_->GetBrowserContext());
   content::URLDataSource::Add(profile, new ScreenshotSource(NULL, profile));
@@ skipping 106 matching lines @@
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("cancel",
       base::Bind(&FeedbackHandler::HandleCancel,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("openSystemTab",
       base::Bind(&FeedbackHandler::HandleOpenSystemTab,
                  base::Unretained(this)));
 }
 
 void FeedbackHandler::HandleGetDialogDefaults(const ListValue*) {
-  // Will delete itself when feedback_data_->SendReport() is called.
   feedback_data_ = new FeedbackData();
 
   // Send back values which the dialog js needs initially.
   DictionaryValue dialog_defaults;
 
   // Current url.
   dialog_defaults.SetString("currentUrl", target_tab_url_);
 
   // Are screenshots disabled?
   dialog_defaults.SetBoolean(
       "disableScreenshots",
       g_browser_process->local_state()->GetBoolean(prefs::kDisableScreenshots));
 
   // User e-mail
   std::string user_email = GetUserEmail();
   dialog_defaults.SetString("userEmail", user_email);
 
   // Set email checkbox to checked by default for cros, unchecked for Chrome.
   dialog_defaults.SetBoolean(
       "emailCheckboxDefault",
 #if defined(OS_CHROMEOS)
       true);
 #else
       false);
 #endif
 
 
 #if defined(OS_CHROMEOS)
-  // Trigger the request for system information here.
-  chromeos::system::SyslogsProvider* provider =
-      chromeos::system::SyslogsProvider::GetInstance();
-  if (provider) {
-    syslogs_task_id_ = provider->RequestSyslogs(
-        true,  // don't compress.
-        chromeos::system::SyslogsProvider::SYSLOGS_FEEDBACK,
-        base::Bind(&FeedbackData::SyslogsComplete,
-                   base::Unretained(feedback_data_)),
-        &syslogs_tracker_);
-  }
+  feedback_data_->StartSyslogsCollection();
 
   // On ChromeOS if the user's email is blank, it means we don't
   // have a logged in user, hence don't use saved screenshots.
   dialog_defaults.SetBoolean("useSaved", !user_email.empty());
 #endif
 
   web_ui()->CallJavascriptFunction("setupDialogDefaults", dialog_defaults);
 }
 
 void FeedbackHandler::HandleRefreshCurrentScreenshot(const ListValue*) {
@@ skipping 68 matching lines @@
   // Get the image to send in the report.
   ScreenshotDataPtr image_ptr;
   if (!screenshot_path.empty() &&  screenshot_source_)
     image_ptr = screenshot_source_->GetCachedScreenshot(screenshot_path);
 
 #if defined(OS_CHROMEOS)
   std::string sys_info_checkbox;
   (*i++)->GetAsString(&sys_info_checkbox);
   bool send_sys_info = (sys_info_checkbox == "true");
 
-  // If we aren't sending the sys_info, cancel the gathering of the syslogs.
-  if (!send_sys_info)
-    CancelFeedbackCollection();
-
   std::string attached_filename;
   std::string* attached_filedata = NULL;
   // If we have an attached file, we'll still have more data in the list.
   if (i != list_value->end()) {
     (*i++)->GetAsString(&attached_filename);
     if (base::FilePath::IsSeparator(attached_filename[0])) {
       // We have an attached filepath, not filename, hence we need read this
       // this file in chrome. We won't have any file data, skip over it.
       i++;
     } else {
       std::string encoded_filedata;
       attached_filedata = new std::string;
       (*i++)->GetAsString(&encoded_filedata);
       if (!base::Base64Decode(
           base::StringPiece(encoded_filedata), attached_filedata)) {
         LOG(ERROR) << "Unable to attach file: " << attached_filename;
         // Clear the filename so feedback_util doesn't try to attach the file.
         attached_filename = "";
       }
     }
   }
 #endif
 
-  // Update the data in feedback_data_ so it can be sent
-  feedback_data_->UpdateData(Profile::FromWebUI(web_ui())
-                             , std::string()
-                             , page_url
-                             , description
-                             , user_email
-                             , image_ptr
+  // TODO(rkc): We are not setting the category tag here since this
+  // functionality is broken on the feedback server side. Fix this once the
+  // issue is resolved.
+  feedback_data_->set_description(description);
+  feedback_data_->set_image(image_ptr);
+  feedback_data_->set_page_url(page_url);
+  feedback_data_->set_profile(Profile::FromWebUI(web_ui()));
+  feedback_data_->set_user_email(user_email);
 #if defined(OS_CHROMEOS)
-                             , send_sys_info
-                             , false  // sent_report
-                             , timestamp_
-                             , attached_filename
-                             , attached_filedata
+  feedback_data_->set_attached_filedata(attached_filedata);
+  feedback_data_->set_attached_filename(attached_filename);
+  feedback_data_->set_send_sys_info(send_sys_info);
+  feedback_data_->set_timestamp(timestamp_);
 #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.
-  // Otherwise, the report will get sent when we receive sys_info.
-  if (!send_sys_info || feedback_data_->sys_info() != NULL ||
-      syslogs_task_id_ == CancelableTaskTracker::kBadTaskId) {
-    feedback_data_->SendReport();
-  }
-#else
-  feedback_data_->SendReport();
-#endif
-  // Lose the pointer to the FeedbackData object; the object will delete itself
-  // from SendReport, whether we called it, or will be called by the log
-  // completion routine.
-  feedback_data_ = NULL;
+  // Signal the feedback object that the data from the feedback page has been
+  // filled - the object will manage sending of the actual report.
+  feedback_data_->FeedbackPageDataComplete();
 
-  // Whether we sent the report, or if it will be sent by the Syslogs complete
-  // function, close our feedback tab anyway, we have no more use for it.
   CloseFeedbackTab();
 }
 
 void FeedbackHandler::HandleCancel(const ListValue*) {
   CloseFeedbackTab();
 }
 
 void FeedbackHandler::HandleOpenSystemTab(const ListValue* args) {
 #if defined(OS_CHROMEOS)
   web_ui()->GetWebContents()->GetDelegate()->OpenURLFromTab(
       web_ui()->GetWebContents(),
       content::OpenURLParams(GURL(chrome::kChromeUISystemInfoURL),
                              content::Referrer(),
                              NEW_FOREGROUND_TAB,
                              content::PAGE_TRANSITION_LINK,
                              false));
 #endif
 }
 
-void FeedbackHandler::CancelFeedbackCollection() {
-#if defined(OS_CHROMEOS)
-  // Canceling a finished task ID or kBadTaskId is a noop.
-  syslogs_tracker_.TryCancel(syslogs_task_id_);
-#endif
-}
-
 void FeedbackHandler::CloseFeedbackTab() {
   ClobberScreenshotsSource();
   tab_->GetDelegate()->CloseContents(tab_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // FeedbackUI
 //
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 36 matching lines @@
                     screenshot_filepaths.begin() + sort_size,
                     screenshot_filepaths.end(),
                     ScreenshotTimestampComp);
   for (size_t i = 0; i < sort_size; ++i)
     saved_screenshots->push_back(
         std::string(ScreenshotSource::kScreenshotUrlRoot) +
         std::string(ScreenshotSource::kScreenshotSaved) +
         screenshot_filepaths[i]);
 }
 #endif