Merge 72441 - Disable sending of page title in Chrome reports....

chrome/browser/dom_ui/bug_report_ui.cc

 // Copyright (c) 2011 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/dom_ui/bug_report_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 208 matching lines @@
   void SetupScreenshotsSource();
   void ClobberScreenshotsSource();
 
   void CancelFeedbackCollection();
   void CloseFeedbackTab();
 
   TabContents* tab_;
   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.
   chromeos::SyslogsLibrary::Handle syslogs_handle_;
   CancelableRequestConsumer syslogs_consumer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(BugReportHandler);
 };
 
@@ skipping 158 matching lines @@
   // In case we already got the syslogs and sent the report, leave
   if (sent_report_) return;
   // Set send_report_ so that no one else processes SendReport
   sent_report_ = true;
 #endif
 
   int image_data_size = image_.size();
   char* image_data = image_data_size ?
       reinterpret_cast<char*>(&(image_.front())) : NULL;
   BugReportUtil::SendReport(profile_
-                            , UTF16ToUTF8(target_tab_title_)
                             , problem_type_
                             , page_url_
                             , description_
                             , image_data
                             , image_data_size
                             , browser::screen_size.width()
                             , browser::screen_size.height()
 #if defined(OS_CHROMEOS)
                             , user_email_
                             , zip_content_ ? zip_content_->c_str() : NULL
@@ skipping 101 matching lines @@
   // Sanity checks.
   if (((index == 0) && (params != "0")) || !browser ||
       index >= browser->tab_count()) {
     return base::StringPiece(
         ResourceBundle::GetSharedInstance().GetRawDataResource(
             IDR_BUGREPORT_HTML_INVALID));
   }
 
   TabContents* target_tab = browser->GetTabContentsAt(index);
   if (target_tab) {
-    target_tab_title_ = target_tab->GetTitle();
     target_tab_url_ = target_tab->GetURL().spec();
   }
 
   // Setup the screenshot source after we've verified input is legit.
   SetupScreenshotsSource();
 
   return base::StringPiece(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_BUGREPORT_HTML));
 }
@@ skipping 137 matching lines @@
   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();
 #endif
 
   // 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
                           , image
 #if defined(OS_CHROMEOS)
                           , user_email
                           , send_sys_info
                           , false // sent_report
 #endif
                           );
@@ skipping 64 matching lines @@
   BugReportUIHTMLSource* html_source =
       new BugReportUIHTMLSource(handler->Init());
   // Set up the chrome://bugreport/ source.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           ChromeURLDataManager::GetInstance(),
           &ChromeURLDataManager::AddDataSource,
           make_scoped_refptr(html_source)));
 }