Revert 282130 "Adds API test for imageWriterPrivate.writeFromFile"

trunk/src/chrome/browser/extensions/api/image_writer_private/operation.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 "chrome/browser/extensions/api/image_writer_private/operation.h"
 
 #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"
 #include "content/public/browser/browser_thread.h"
 
 namespace extensions {
 namespace image_writer {
 
 using content::BrowserThread;
 
 const int kMD5BufferSize = 1024;
 #if defined(OS_CHROMEOS)
 // Chrome OS only has a 1 GB temporary partition.  This is too small to hold our
 // unzipped image. Fortunately we mount part of the temporary partition under
 // /var/tmp.
 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)
     : manager_(manager),
       extension_id_(extension_id),
 #if defined(OS_WIN)
       device_path_(base::FilePath::FromUTF8Unsafe(device_path)),
 #else
       device_path_(device_path),
 #endif
@@ skipping 17 matching lines @@
 
 int Operation::GetProgress() {
   return progress_;
 }
 
 image_writer_api::Stage Operation::GetStage() {
   return stage_;
 }
 
 #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
 
 void Operation::Start() {
 #if defined(OS_CHROMEOS)
   if (!temp_dir_.CreateUniqueTempDirUnderPath(
            base::FilePath(kChromeOSTempRoot))) {
 #else
   if (!temp_dir_.CreateUniqueTempDir()) {
 #endif
@@ skipping 158 matching lines @@
 
 void Operation::CompleteAndContinue(const base::Closure& continuation) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   SetProgress(kProgressComplete);
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, continuation);
 }
 
 #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));
   }
 }
 
 void Operation::StopUtilityClient() {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   BrowserThread::PostTask(
       BrowserThread::IO,
@@ skipping 121 matching lines @@
   for (std::vector<base::Closure>::iterator it = cleanup_functions_.begin();
        it != cleanup_functions_.end();
        ++it) {
     it->Run();
   }
   cleanup_functions_.clear();
 }
 
 }  // namespace image_writer
 }  // namespace extensions