Get rid of single process code path in json_asynchronous_unpacker.cc.

chrome/browser/web_resource/json_asynchronous_unpacker.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 "chrome/browser/web_resource/json_asynchronous_unpacker.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/web_resource/web_resource_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_utility_messages.h"
-#include "chrome/common/web_resource/web_resource_unpacker.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/utility_process_host.h"
 #include "content/public/browser/utility_process_host_client.h"
 
 using content::BrowserThread;
 using content::UtilityProcessHost;
 using content::UtilityProcessHostClient;
 
 // This class coordinates a web resource unpack and parse task which is run in
 // a separate process.  Results are sent back to this class and routed to
 // the WebResourceService.
 class JSONAsynchronousUnpackerImpl
     : public UtilityProcessHostClient,
       public JSONAsynchronousUnpacker {
  public:
   explicit JSONAsynchronousUnpackerImpl(
       JSONAsynchronousUnpackerDelegate* delegate)
     : JSONAsynchronousUnpacker(delegate),
       got_response_(false) {
   }
 
   virtual void Start(const std::string& json_data) OVERRIDE {
     AddRef();  // balanced in Cleanup.
 
-    // TODO(willchan): Look for a better signal of whether we're in a unit test
-    // or not. Using |ResourceDispatcherHost::Get()| for this is pretty lame.
-    // If we don't have a ResourceDispatcherHost, assume we're in a test and
-    // run the unpacker directly in-process.
-    bool use_utility_process =
-        content::ResourceDispatcherHost::Get() &&
-        !CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess);
-    if (use_utility_process) {
-      BrowserThread::ID thread_id;
-      CHECK(BrowserThread::GetCurrentThreadIdentifier(&thread_id));
-      BrowserThread::PostTask(
-          BrowserThread::IO, FROM_HERE,
-          base::Bind(
-              &JSONAsynchronousUnpackerImpl::StartProcessOnIOThread,
-              this, thread_id, json_data));
-    } else {
-      WebResourceUnpacker unpacker(json_data);
-      if (unpacker.Run()) {
-        OnUnpackWebResourceSucceeded(*unpacker.parsed_json());
-      } else {
-        OnUnpackWebResourceFailed(unpacker.error_message());
-      }
-    }
+    BrowserThread::ID thread_id;
+    CHECK(BrowserThread::GetCurrentThreadIdentifier(&thread_id));
+    BrowserThread::PostTask(
+        BrowserThread::IO, FROM_HERE,
+        base::Bind(
+            &JSONAsynchronousUnpackerImpl::StartProcessOnIOThread,
+            this, thread_id, json_data));
   }
 
  private:
   virtual ~JSONAsynchronousUnpackerImpl() {}
 
   // UtilityProcessHostClient.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
     bool handled = true;
     IPC_BEGIN_MESSAGE_MAP(JSONAsynchronousUnpackerImpl, message)
       IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_UnpackWebResource_Succeeded,
@@ skipping 46 matching lines @@
   // True if we got a response from the utility process and have cleaned up
   // already.
   bool got_response_;
 };
 
 JSONAsynchronousUnpacker* JSONAsynchronousUnpacker::Create(
     JSONAsynchronousUnpackerDelegate* delegate) {
   return new JSONAsynchronousUnpackerImpl(delegate);
 }