Add a content::GetUserAgent() to wrap webkit_glue::GetUserAgent()

chrome/browser/ui/webui/options/chromeos/about_page_handler.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/ui/webui/options/chromeos/about_page_handler.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/power_library.h"
 #include "chrome/browser/chromeos/cros/update_library.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/url_constants.h"
+#include "content/common/content_client.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "v8/include/v8.h"
-#include "webkit/glue/user_agent.h"
 #include "webkit/glue/webkit_glue.h"
 
 namespace {
 
 // These are used as placeholder text around the links in the text in the
 // license.
 const char kBeginLink[] = "BEGIN_LINK";
 const char kEndLink[] = "END_LINK";
 const char kBeginLinkChr[] = "BEGIN_LINK_CHR";
 const char kBeginLinkOss[] = "BEGIN_LINK_OSS";
@@ skipping 160 matching lines @@
                                webkit_glue::GetWebKitVersion());
 
   // javascript
 
   localized_strings->SetString("js_engine", "V8");
   localized_strings->SetString("js_engine_version", v8::V8::GetVersion());
 
   // user agent
 
   localized_strings->SetString("user_agent_info",
-                               webkit_glue::GetUserAgent(GURL()));
+                               content::GetUserAgent(GURL()));
 
   // command line
 
 #if defined(OS_WIN)
   localized_strings->SetString("command_line_info",
       WideToUTF16(CommandLine::ForCurrentProcess()->GetCommandLineString()));
 #elif defined(OS_POSIX)
   // TODO(viettrungluu): something horrible might happen if there are non-UTF-8
   // arguments (since |SetString()| requires Unicode).
   std::string command_line = "";
@@ skipping 186 matching lines @@
   if (CrosLibrary::Get()->GetUpdateLibrary()->HasObserver(observer)) {
     // If UpdateLibrary still has the observer, then the page handler is valid.
     AboutPageHandler* handler = observer->page_handler();
     scoped_ptr<Value> channel_string(Value::CreateStringValue(channel));
     handler->web_ui_->CallJavascriptFunction(
         "AboutPage.updateSelectedOptionCallback", *channel_string);
   }
 }
 
 } // namespace chromeos