Simplify the user agent code some more since after r255534 it's not affected by the site's URL.

content/app/content_main_runner.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/public/app/content_main_runner.h"
 
 #include <stdlib.h>
 
 #include "base/allocator/allocator_extension.h"
 #include "base/at_exit.h"
@@ skipping 33 matching lines @@
 #include "content/public/common/sandbox_init.h"
 #include "content/renderer/in_process_renderer_thread.h"
 #include "content/utility/in_process_utility_thread.h"
 #include "crypto/nss_util.h"
 #include "ipc/ipc_switches.h"
 #include "media/base/media.h"
 #include "sandbox/win/src/sandbox_types.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/win/dpi.h"
-#include "webkit/common/user_agent/user_agent.h"
 
 #if defined(USE_TCMALLOC)
 #include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h"
 #if defined(TYPE_PROFILING)
 #include "base/allocator/type_profiler.h"
 #include "base/allocator/type_profiler_tcmalloc.h"
 #endif
 #endif
 
 #if !defined(OS_IOS)
@@ skipping 308 matching lines @@
 
   if (delegate) delegate->ZygoteForked();
 
   // Zygote::HandleForkRequest may have reallocated the command
   // line so update it here with the new version.
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   std::string process_type =
       command_line.GetSwitchValueASCII(switches::kProcessType);
   ContentClientInitializer::Set(process_type, delegate);
 
-  // If a custom user agent was passed on the command line, we need
-  // to (re)set it now, rather than using the default one the zygote
-  // initialized.
-  if (command_line.HasSwitch(switches::kUserAgent)) {
-    webkit_glue::SetUserAgent(
-        command_line.GetSwitchValueASCII(switches::kUserAgent));
-  }
-
   // The StatsTable must be initialized in each process; we already
   // initialized for the browser process, now we need to initialize
   // within the new processes as well.
   InitializeStatsTable(command_line);
 
   MainFunctionParams main_params(command_line);
 
   for (size_t i = 0; i < arraysize(kMainFunctions); ++i) {
     if (process_type == kMainFunctions[i].name)
       return kMainFunctions[i].function(main_params);
@@ skipping 339 matching lines @@
     RegisterPathProvider();
     RegisterContentSchemes(true);
 
     CHECK(base::i18n::InitializeICU());
 
     InitializeStatsTable(command_line);
 
     if (delegate_)
       delegate_->PreSandboxStartup();
 
-    // Set any custom user agent passed on the command line now so the string
-    // doesn't change between calls to webkit_glue::GetUserAgent(), otherwise it
-    // defaults to the user agent set during SetContentClient().
-    if (command_line.HasSwitch(switches::kUserAgent)) {
-      webkit_glue::SetUserAgent(
-          command_line.GetSwitchValueASCII(switches::kUserAgent));
-    }
-
     if (!process_type.empty())
       CommonSubprocessInit(process_type);
 
 #if defined(OS_WIN)
     CHECK(InitializeSandbox(params.sandbox_info));
 #elif defined(OS_MACOSX) && !defined(OS_IOS)
     if (process_type == switches::kRendererProcess ||
         process_type == switches::kPpapiPluginProcess ||
         (delegate_ && delegate_->DelaySandboxInitialization(process_type))) {
       // On OS X the renderer sandbox needs to be initialized later in the
@@ skipping 86 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
 };
 
 // static
 ContentMainRunner* ContentMainRunner::Create() {
   return new ContentMainRunnerImpl();
 }
 
 }  // namespace content