Revert 282130 "Adds API test for imageWriterPrivate.writeFromFile"

trunk/src/chrome/browser/extensions/api/image_writer_private/operation.cc

Index: trunk/src/chrome/browser/extensions/api/image_writer_private/operation.cc
===================================================================
--- trunk/src/chrome/browser/extensions/api/image_writer_private/operation.cc	(revision 282139)
+++ trunk/src/chrome/browser/extensions/api/image_writer_private/operation.cc	(working copy)
@@ -6,7 +6,6 @@
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
-#include "base/lazy_instance.h"
 #include "base/threading/worker_pool.h"
 #include "chrome/browser/extensions/api/image_writer_private/error_messages.h"
 #include "chrome/browser/extensions/api/image_writer_private/operation_manager.h"
@@ -25,11 +24,6 @@
 const char kChromeOSTempRoot[] = "/var/tmp";
 #endif
 
-#if !defined(OS_CHROMEOS)
-static base::LazyInstance<scoped_refptr<ImageWriterUtilityClient> >
-    g_utility_client = LAZY_INSTANCE_INITIALIZER;
-#endif
-
 Operation::Operation(base::WeakPtr<OperationManager> manager,
                      const ExtensionId& extension_id,
                      const std::string& device_path)
@@ -67,10 +61,11 @@
 }
 
 #if !defined(OS_CHROMEOS)
-// static
 void Operation::SetUtilityClientForTesting(
     scoped_refptr<ImageWriterUtilityClient> client) {
-  g_utility_client.Get() = client;
+  image_writer_client_ = client;
+  AddCleanUpFunction(
+      base::Bind(&ImageWriterUtilityClient::Shutdown, image_writer_client_));
 }
 #endif
 
@@ -249,10 +244,6 @@
 #if !defined(OS_CHROMEOS)
 void Operation::StartUtilityClient() {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
-  if (g_utility_client.Get()) {
-    image_writer_client_ = g_utility_client.Get();
-    return;
-  }
   if (!image_writer_client_) {
     image_writer_client_ = new ImageWriterUtilityClient();
     AddCleanUpFunction(base::Bind(&Operation::StopUtilityClient, this));