Make document service an interface

chrome/browser/chromeos/gdata/gdata_file_system.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_FILE_SYSTEM_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_
 
 #include <map>
 
 #include "base/gtest_prod_util.h"
@@ skipping 347 matching lines @@
                       int64 content_length,
                       const FilePath& destination_directory,
                       const InitiateUploadOperationCallback& callback);
 
   // Resumes upload operation for chunk of file defined in |params..
   //
   // Can be called from any thread. |callback| is run on the calling thread.
   void ResumeUpload(const ResumeUploadParams& params,
                     const ResumeUploadOperationCallback& callback);
 
+  // Only used by tests to inject a mock documents service.
+  void ReplaceDocumentsService(

[satorux1, 2012/03/08 01:48:37]

Rather than replacing it, wouldn't it be cleaner to inject DocumentsService from
the constructor or Init()?

[Greg Spencer (Chromium), 2012/03/08 19:06:35]

It would, but I worried about the following too much:  Where should I supply it,
since this is a singleton created by the profile creation service, and would it
cause problems with the embedded dependency mechanism in the profile creation
code (now, or maybe in the future) if I bypassed that and created one directly.

[satorux1, 2012/03/08 19:28:37]

As mentioned elsewhere, I think you can inject from the constructor in the unit
test.

[Greg Spencer (Chromium), 2012/03/09 00:33:30]

Done.

+      scoped_ptr<DocumentsServiceInterface> documents_service);
+
   // Unsafe (unlocked) version of the function above.
   void UnsafeFindFileByPath(const FilePath& file_path,
                             scoped_refptr<FindFileDelegate> delegate);
 
   // Converts document feed from gdata service into DirectoryInfo. On failure,
   // returns NULL and fills in |error| with an appropriate value.
   GDataDirectory* ParseGDataFeed(GDataErrorCode status,
                                  base::Value* data,
                                  base::PlatformFileError *error);
 
@@ skipping 71 matching lines @@
   // if directory can't be found.
   GURL GetUploadUrlForDirectory(const FilePath& destination_directory);
 
     scoped_ptr<GDataDirectory> root_;
   base::Lock lock_;
 
   // The profile hosts the GDataFileSystem.
   Profile* profile_;
 
   // The document service for the GDataFileSystem.
-  scoped_ptr<DocumentsService> documents_service_;
+  scoped_ptr<DocumentsServiceInterface> documents_service_;
 
   // File content uploader.
   scoped_ptr<GDataUploader> uploader_;
 
   base::WeakPtrFactory<GDataFileSystem> weak_ptr_factory_;
 };
 
 // Singleton that owns all GDataFileSystems and associates them with
 // Profiles.
 class GDataFileSystemFactory : public ProfileKeyedServiceFactory {
@@ skipping 67 matching lines @@
                                                     GDataDirectory*) OVERRIDE;
   virtual void OnError(base::PlatformFileError) OVERRIDE;
 
   // File entry that was found.
   GDataFileBase* file_;
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_