Fix flakiness in RemoteFileSystemExtensionApiTests

chrome/browser/chromeos/gdata/gdata_system_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_SYSTEM_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_SYSTEM_SERVICE_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
 
+class FilePath;
+
 namespace gdata {
 
 class DocumentsServiceInterface;
 class DriveWebAppsRegistry;
 class GDataCache;
 class GDataDownloadObserver;
 class GDataFileSystemInterface;
 class GDataSyncClient;
 class GDataUploader;
 
@@ skipping 22 matching lines @@
 
   // ProfileKeyedService override:
   virtual void Shutdown() OVERRIDE;
 
  private:
   explicit GDataSystemService(Profile* profile);
   virtual ~GDataSystemService();
 
   // Initializes the object. This function should be called before any
   // other functions.
-  void Initialize(DocumentsServiceInterface* documents_service);
+  void Initialize(DocumentsServiceInterface* documents_service,
+                  const FilePath& cache_root);
 
   // Registers remote file system proxy for drive mount point.
   void AddDriveMountPoint();
   // Unregisters drive mount point from File API.
   void RemoveDriveMountPoint();
 
   friend class GDataSystemServiceFactory;
 
   Profile* profile_;
   const base::SequencedWorkerPool::SequenceToken sequence_token_;
@@ skipping 15 matching lines @@
   // Returns the GDataSystemService for |profile|, creating it if it is not
   // yet created.
   static GDataSystemService* GetForProfile(Profile* profile);
   // Returns the GDataSystemService that is already associated with |profile|,
   // if it is not yet created it will return NULL.
   static GDataSystemService* FindForProfile(Profile* profile);
 
   // Returns the GDataSystemServiceFactory instance.
   static GDataSystemServiceFactory* GetInstance();
 
-  // Just creates a new instance without initializing most of the fields.
-  // This is useful for tests such as injecting mocks.
-  static ProfileKeyedService* CreateInstance(Profile* profile);
+  // Sets documents service that should be used to initialize file system in
+  // test. Should be called before the service is created.
+  // Please, make sure |documents_service| gets deleted if no system service is
+  // created (e.g. by calling this method with NULL).
+  static void set_documents_service_for_test(
+      DocumentsServiceInterface* documents_service);
 
-  // Returns GDataSystemService for testing, with |documents_service| injected
-  // to GDataFileSystem.
-  GDataSystemService* GetWithCustomDocumentsServiceForTesting(
-      Profile* profile,
-      DocumentsServiceInterface* documents_service);
+  // Sets root path for the cache used in test. Should be called before the
+  // service is created.
+  // If |cache_root| is not empty, new string object will be created. Please,
+  // make sure it gets deleted if no system service is created (e.g. by calling
+  // this method with empty string).
+  static void set_cache_root_for_test(const std::string& cache_root);
 
  private:
   friend struct DefaultSingletonTraits<GDataSystemServiceFactory>;
 
   GDataSystemServiceFactory();
   virtual ~GDataSystemServiceFactory();
 
   // ProfileKeyedServiceFactory:
   virtual ProfileKeyedService* BuildServiceInstanceFor(
       Profile* profile) const OVERRIDE;
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_SYSTEM_SERVICE_H_