Revert 255858 "Simplify the user agent code some more since afte..."

trunk/src/chrome/browser/feedback/feedback_util.cc

 // Copyright (c) 2012 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/feedback/feedback_util.h"
 
 #include <sstream>
 #include <string>
 #include <vector>
 
@@ skipping 13 matching lines @@
 #include "chrome/browser/feedback/feedback_uploader.h"
 #include "chrome/browser/feedback/feedback_uploader_factory.h"
 #include "chrome/browser/metrics/variations/variations_http_header_provider.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/metrics/metrics_log_manager.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_client.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "net/base/load_flags.h"
@@ skipping 114 matching lines @@
   // We're not using gaia ids, we're using the e-mail field instead.
   common_data->set_gaia_id(0);
   common_data->set_user_email(data->user_email());
   common_data->set_description(data->description());
 
   std::string chrome_locale = g_browser_process->GetApplicationLocale();
   common_data->set_source_description_language(chrome_locale);
 
   userfeedback::WebData* web_data = feedback_data.mutable_web_data();
   web_data->set_url(data->page_url());
-  web_data->mutable_navigator()->set_user_agent(GetUserAgent());
+  web_data->mutable_navigator()->set_user_agent(content::GetUserAgent(GURL()));
 
   gfx::Rect screen_size;
   if (data->sys_info()) {
     for (FeedbackData::SystemLogsMap::const_iterator i =
         data->sys_info()->begin(); i != data->sys_info()->end(); ++i) {
       if (FeedbackData::BelowCompressionThreshold(i->second))
         AddFeedbackData(&feedback_data, i->first, i->second);
     }
 
     AddAttachment(&feedback_data, kLogsAttachmentName, data->compressed_logs());
@@ skipping 83 matching lines @@
       zip::Zip(temp_path, zip_file, false) &&
       base::ReadFileToString(zip_file, compressed_logs);
 
   base::DeleteFile(temp_path, true);
   base::DeleteFile(zip_file, false);
 
   return succeed;
 }
 
 }  // namespace feedback_util