Refactor FeedbackData and add tests.

chrome/browser/extensions/api/feedback_private/feedback_service.cc

 // Copyright 2013 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/extensions/api/feedback_private/feedback_service.h"
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 55 matching lines @@
         base::Bind(&FeedbackService::ScreenshotCallback,
                    GetWeakPtr()));
     screenshot_reader->Start();
   }
 
   CompleteSendFeedback();
 }
 
 void FeedbackService::AttachedFileCallback(scoped_ptr<std::string> data,
                                            int64 /* total_blob_length */) {
-  if (!data.get())
-    feedback_data_->set_attached_file_uuid(std::string());
-  else
+  feedback_data_->set_attached_file_uuid(std::string());
+  if (data)
     feedback_data_->AttachAndCompressFileData(data.Pass());
 
   CompleteSendFeedback();
 }
 
 void FeedbackService::ScreenshotCallback(scoped_ptr<std::string> data,
                                          int64 /* total_blob_length */) {
-  if (!data.get())
-    feedback_data_->set_screenshot_uuid(std::string());
-  else
+  feedback_data_->set_screenshot_uuid(std::string());
+  if (data)
     feedback_data_->set_image(data.Pass());
 
   CompleteSendFeedback();
 }
 
 void FeedbackService::GetSystemInformation(
     const GetSystemInformationCallback& callback) {
   system_information_callback_ = callback;
 
   system_logs::ScrubbedSystemLogsFetcher* fetcher =
@@ skipping 19 matching lines @@
 }
 
 void FeedbackService::CompleteSendFeedback() {
   // A particular data collection is considered completed if,
   // a.) The blob URL is invalid - this will either happen because we never had
   //     a URL and never needed to read this data, or that the data read failed
   //     and we set it to invalid in the data read callback.
   // b.) The associated data object exists, meaning that the data has been read
   //     and the read callback has updated the associated data on the feedback
   //     object.
-  bool attached_file_completed =
-      feedback_data_->attached_file_uuid().empty() ||
-      feedback_data_->attached_filedata();
-  bool screenshot_completed =
-      feedback_data_->screenshot_uuid().empty() ||
-      feedback_data_->image();
+  bool attached_file_completed = feedback_data_->attached_file_uuid().empty();
+  bool screenshot_completed = feedback_data_->screenshot_uuid().empty();
 
   if (screenshot_completed && attached_file_completed) {
     // 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_->OnFeedbackPageDataComplete();
     // TODO(rkc): Change this once we have FeedbackData/Util refactored to
     // report the status of the report being sent.
     send_feedback_callback_.Run(true);
   }
 }
 
 }  // namespace extensions