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

trunk/src/content/renderer/service_worker/embedded_worker_dispatcher.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/renderer/service_worker/embedded_worker_dispatcher.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/child/child_process.h"
 #include "content/child/scoped_child_process_reference.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/worker_task_runner.h"
 #include "content/common/service_worker/embedded_worker_messages.h"
-#include "content/public/common/content_client.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/service_worker/embedded_worker_context_client.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebEmbeddedWorker.h"
 #include "third_party/WebKit/public/web/WebEmbeddedWorkerStartData.h"
+#include "webkit/common/user_agent/user_agent.h"
 
 namespace content {
 
 // A thin wrapper of WebEmbeddedWorker which also adds and releases process
 // references automatically.
 class EmbeddedWorkerDispatcher::WorkerWrapper {
  public:
   explicit WorkerWrapper(blink::WebEmbeddedWorker* worker) : worker_(worker) {}
   ~WorkerWrapper() {}
 
@@ skipping 34 matching lines @@
   scoped_ptr<WorkerWrapper> wrapper(new WorkerWrapper(
       blink::WebEmbeddedWorker::create(
           new EmbeddedWorkerContextClient(
               embedded_worker_id,
               service_worker_version_id,
               script_url),
           NULL)));
 
   blink::WebEmbeddedWorkerStartData start_data;
   start_data.scriptURL = script_url;
-  start_data.userAgent = base::UTF8ToUTF16(GetContentClient()->GetUserAgent());
+  start_data.userAgent =
+      base::UTF8ToUTF16(webkit_glue::GetUserAgent(script_url));
   start_data.startMode = blink::WebEmbeddedWorkerStartModeDontPauseOnStart;
 
   wrapper->worker()->startWorkerContext(start_data);
   workers_.AddWithID(wrapper.release(), embedded_worker_id);
 }
 
 void EmbeddedWorkerDispatcher::OnStopWorker(int embedded_worker_id) {
   WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id);
   if (!wrapper) {
     LOG(WARNING) << "Got OnStopWorker for nonexistent worker";
     return;
   }
 
   // This should eventually call WorkerContextDestroyed. (We may need to post
   // a delayed task to forcibly abort the worker context if we find it
   // necessary)
   wrapper->worker()->terminateWorkerContext();
 }
 
 }  // namespace content