Move --user-agent overriding logic from chrome into content.

content/test/test_content_client.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 "content/test/test_content_client.h"
 
 #include "base/base_paths.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 22 matching lines @@
 
 void TestContentClient::AddNPAPIPlugins(
     webkit::npapi::PluginList* plugin_list) {
 }
 
 bool TestContentClient::CanHandleWhileSwappedOut(const IPC::Message& msg) {
   // TestContentClient does not need to handle any additional messages.
   return false;
 }
 
-std::string TestContentClient::GetUserAgent(bool* overriding) const {
-  *overriding = false;
+std::string TestContentClient::GetUserAgent() const {
   return std::string("TestContentClient");
 }
 
 string16 TestContentClient::GetLocalizedString(int message_id) const {
   return string16();
 }
 
 base::StringPiece TestContentClient::GetDataResource(int resource_id) const {
   base::StringPiece resource;
   data_pack_.GetStringPiece(resource_id, &resource);
   return resource;
 }
 
 #if defined(OS_WIN)
 bool TestContentClient::SandboxPlugin(CommandLine* command_line,
                                       sandbox::TargetPolicy* policy) {
   return false;
 }
 #endif
 
 #if defined(OS_MACOSX)
 bool TestContentClient::GetSandboxProfileForSandboxType(
     int sandbox_type,
     int* sandbox_profile_resource_id) const {
   return false;
 }
 #endif