Disable sending of page title in Chrome reports.

Page title can leak privacy information hence we don't really want it.

BUG=66716
TEST=Sent a report to confirm page title is no longer being sent.

Review URL: http://codereview.chromium.org/6366007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72441 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 10 insertions, 27 deletions

diff --git a/chrome/browser/bug_report_data.cc b/chrome/browser/bug_report_data.cc
index 26ab729..e4d4866 100644
--- a/chrome/browser/bug_report_data.cc
+++ b/chrome/browser/bug_report_data.cc
@@ -21,7 +21,6 @@ BugReportData::~BugReportData() {}
 
 void BugReportData::UpdateData(Profile* profile,
                                const std::string& target_tab_url,
-                               const string16& target_tab_title,
                                const int problem_type,
                                const std::string& page_url,
                                const std::string& description,
@@ -34,7 +33,6 @@ void BugReportData::UpdateData(Profile* profile,
                                ) {
   profile_ = profile;
   target_tab_url_ = target_tab_url;
-  target_tab_title_ = target_tab_title;
   problem_type_ = problem_type;
   page_url_ = page_url;
   description_ = description;
diff --git a/chrome/browser/bug_report_data.h b/chrome/browser/bug_report_data.h
index 2c3a6dd..028e928 100644
--- a/chrome/browser/bug_report_data.h
+++ b/chrome/browser/bug_report_data.h
@@ -31,7 +31,6 @@ class BugReportData {
 
   void UpdateData(Profile* profile,
                   const std::string& target_tab_url,
-                  const string16& target_tab_title,
                   const int problem_type,
                   const std::string& page_url,
                   const std::string& description,
@@ -48,19 +47,18 @@ class BugReportData {
                        std::string* zip_content);
 #endif
 
-  const std::string& target_tab_url() { return target_tab_url_; }
-  const string16& target_tab_title() { return target_tab_title_; }
+  const std::string& target_tab_url() const { return target_tab_url_; }
 
-  int problem_type() { return problem_type_; }
-  const std::string& page_url() { return page_url_; }
-  const std::string& description() { return description_; }
-  const std::vector<unsigned char>& image() { return image_; }
+  int problem_type() const { return problem_type_; }
+  const std::string& page_url() const { return page_url_; }
+  const std::string& description() const { return description_; }
+  const std::vector<unsigned char>& image() const { return image_; }
 #if defined(OS_CHROMEOS)
-  const std::string& user_email() { return user_email_; }
-  const chromeos::LogDictionaryType* sys_info() { return sys_info_; }
-  const bool send_sys_info() { return send_sys_info_; }
-  const bool sent_report() { return sent_report_; }
-  const std::string* zip_content() { return zip_content_; }
+  const std::string& user_email() const { return user_email_; }
+  chromeos::LogDictionaryType* sys_info() const { return sys_info_; }
+  bool send_sys_info() const { return send_sys_info_; }
+  bool sent_report() const { return sent_report_; }
+  std::string* zip_content() const { return zip_content_; }
 #endif
 
 
@@ -69,8 +67,6 @@ class BugReportData {
 
   // Target tab url.
   std::string target_tab_url_;
-  // Target tab page title.
-  string16 target_tab_title_;
 
   int problem_type_;
   std::string page_url_;
diff --git a/chrome/browser/bug_report_util.cc b/chrome/browser/bug_report_util.cc
index c02bc7d..1a35b63 100644
--- a/chrome/browser/bug_report_util.cc
+++ b/chrome/browser/bug_report_util.cc
@@ -258,7 +258,6 @@ bool BugReportUtil::ValidFeedbackSize(const std::string& content) {
 
 // static
 void BugReportUtil::SendReport(Profile* profile,
-    const std::string& page_title_text,
     int problem_type,
     const std::string& page_url_text,
     const std::string& description,
@@ -288,10 +287,6 @@ void BugReportUtil::SendReport(Profile* profile,
   // they wish
   common_data->set_gaia_id(0);
 
-  // Add the page title.
-  AddFeedbackData(&feedback_data, std::string(kPageTitleTag),
-                  page_title_text);
-
 #if defined(OS_CHROMEOS)
   // Add the user e-mail to the feedback object
   common_data->set_user_email(user_email_text);
diff --git a/chrome/browser/bug_report_util.h b/chrome/browser/bug_report_util.h
index 3bb9ee3..2a6c8a4 100644
--- a/chrome/browser/bug_report_util.h
+++ b/chrome/browser/bug_report_util.h
@@ -64,7 +64,6 @@ class BugReportUtil {
 
   // Generates bug report data.
   static void SendReport(Profile* profile,
-      const std::string& page_title_text,
       int problem_type,
       const std::string& page_url_text,
       const std::string& description,
diff --git a/chrome/browser/dom_ui/bug_report_ui.cc b/chrome/browser/dom_ui/bug_report_ui.cc
index 9fd907c..9b07da8 100644
--- a/chrome/browser/dom_ui/bug_report_ui.cc
+++ b/chrome/browser/dom_ui/bug_report_ui.cc
@@ -226,7 +226,6 @@ class BugReportHandler : public DOMMessageHandler,
   DOMUIScreenshotSource* screenshot_source_;
 
   BugReportData* bug_report_;
-  string16 target_tab_title_;
   std::string target_tab_url_;
 #if defined(OS_CHROMEOS)
   // Variables to track SyslogsLibrary::RequestSyslogs callback.
@@ -405,7 +404,6 @@ void BugReportData::SendReport() {
   char* image_data = image_data_size ?
       reinterpret_cast<char*>(&(image_.front())) : NULL;
   BugReportUtil::SendReport(profile_
-                            , UTF16ToUTF8(target_tab_title_)
                             , problem_type_
                             , page_url_
                             , description_
@@ -527,7 +525,6 @@ base::StringPiece BugReportHandler::Init() {
 
   TabContents* target_tab = browser->GetTabContentsAt(index);
   if (target_tab) {
-    target_tab_title_ = target_tab->GetTitle();
     target_tab_url_ = target_tab->GetURL().spec();
   }
 
@@ -685,7 +682,6 @@ void BugReportHandler::HandleSendReport(const ListValue* list_value) {
   // Update the data in bug_report_ so it can be sent
   bug_report_->UpdateData(dom_ui_->GetProfile()
                           , target_tab_url_
-                          , target_tab_title_
                           , problem_type
                           , page_url
                           , description
diff --git a/chrome/browser/ui/cocoa/bug_report_window_controller.mm b/chrome/browser/ui/cocoa/bug_report_window_controller.mm
index 39176fa..c55954c 100644
--- a/chrome/browser/ui/cocoa/bug_report_window_controller.mm
+++ b/chrome/browser/ui/cocoa/bug_report_window_controller.mm
@@ -110,7 +110,6 @@
   } else {
     BugReportUtil::SendReport(
         profile_,
-        base::SysNSStringToUTF8(pageTitle_),
         [self bugTypeFromIndex],
         base::SysNSStringToUTF8(pageURL_),
         base::SysNSStringToUTF8(bugDescription_),