Refactor FeedbackData and add tests.

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

Index: chrome/browser/extensions/api/feedback_private/feedback_service.cc
diff --git a/chrome/browser/extensions/api/feedback_private/feedback_service.cc b/chrome/browser/extensions/api/feedback_private/feedback_service.cc
index 31a1c6ca036b68c9bad9f0aff6e595d596e18d68..580c86a8431e8c3f6bc847653817918ad04be893 100644
--- a/chrome/browser/extensions/api/feedback_private/feedback_service.cc
+++ b/chrome/browser/extensions/api/feedback_private/feedback_service.cc
@@ -73,9 +73,8 @@ void FeedbackService::SendFeedback(
 
 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();
@@ -83,9 +82,8 @@ void FeedbackService::AttachedFileCallback(scoped_ptr<std::string> data,
 
 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();
@@ -125,12 +123,8 @@ void FeedbackService::CompleteSendFeedback() {
   // 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