Add the user email field to Chrome.

chrome/browser/feedback/feedback_data.h

Index: chrome/browser/feedback/feedback_data.h
diff --git a/chrome/browser/feedback/feedback_data.h b/chrome/browser/feedback/feedback_data.h
index f6a7a829ae416450005851fda90397f5327a1844..14844b92dfa1053bc4c0a9e72dc96f6a744b3a31 100644
--- a/chrome/browser/feedback/feedback_data.h
+++ b/chrome/browser/feedback/feedback_data.h
@@ -29,9 +29,9 @@ class FeedbackData {
                   const std::string& category_tag,
                   const std::string& page_url,
                   const std::string& description,
+                  const std::string& user_email,
                   ScreenshotDataPtr image
 #if defined(OS_CHROMEOS)
-                  , const std::string& user_email
                   , const bool send_sys_info
                   , const bool sent_report
                   , const std::string& timestamp
@@ -48,9 +48,9 @@ class FeedbackData {
   const std::string& category_tag() const { return category_tag_; }
   const std::string& page_url() const { return page_url_; }
   const std::string& description() const { return description_; }
+  const std::string& user_email() const { return user_email_; }
   ScreenshotDataPtr image() const { return image_; }
 #if defined(OS_CHROMEOS)
-  const std::string& user_email() const { return user_email_; }
   chromeos::system::LogDictionaryType* sys_info() const { return sys_info_; }
   bool send_sys_info() const { return send_sys_info_; }
   bool sent_report() const { return sent_report_; }
@@ -67,11 +67,11 @@ class FeedbackData {
   std::string category_tag_;
   std::string page_url_;
   std::string description_;
+  std::string user_email_;
   ScreenshotDataPtr image_;
 
 #if defined(OS_CHROMEOS)
   // Chromeos specific values for SendReport.
-  std::string user_email_;
   chromeos::system::LogDictionaryType* sys_info_;
   // Content of the compressed system logs.
   std::string* zip_content_;