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

content/test/webkit_support.cc

 // Copyright 2013 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/webkit_support.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_tokenizer.h"
 #include "content/public/common/content_switches.h"
 #include "content/test/test_webkit_platform_support.h"
 #include "third_party/WebKit/public/web/WebCache.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "url/url_util.h"
-#include "webkit/common/user_agent/user_agent.h"
-#include "webkit/common/user_agent/user_agent_util.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
 #include "net/android/network_library.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/test/mock_chrome_application_mac.h"
 #endif
 
@@ skipping 70 matching lines @@
 
 #if defined(OS_MACOSX)
   mock_cr_app::RegisterMockCrApp();
 #endif
 
   // Explicitly initialize the GURL library before spawning any threads.
   // Otherwise crash may happend when different threads try to create a GURL
   // at same time.
   url_util::Initialize();
   test_environment = new TestEnvironment;
-  webkit_glue::SetUserAgent(webkit_glue::BuildUserAgentFromProduct(

[tfarina, 2014/03/07 22:06:07]

this would be my only concern on //content changes as well.

Everything else looks good to me.

-      "DumpRenderTree/0.0.0.0"));

[scottmg, 2014/03/07 21:19:48]

Is this going to break blink tests?

[jam, 2014/03/07 21:34:55]

I had searched for this string but didn't find it used anywhere else so I
thought it should be safe. I'll send out a try job to verify

[jam, 2014/03/07 23:13:03]

looks like this did break webkit_unit_tests, but the fix was simple. updated

 }
 
 void TearDownTestEnvironment() {
   // Flush any remaining messages before we kill ourselves.
   // http://code.google.com/p/chromium/issues/detail?id=9500
   base::RunLoop().RunUntilIdle();
 
   if (RunningOnValgrind())
     blink::WebCache::clear();
   delete test_environment;
   test_environment = NULL;
 }
 
 }  // namespace content