contacts: Make GoogleContactStore own GDataContactsService.

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 <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/gdata/gdata_errorcode.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
 
 class FilePath;
 
 namespace gdata {
 
 class DriveCache;
 class DriveServiceInterface;
 class DriveWebAppsRegistry;
 class FileWriteHelper;
-class GDataContactsService;
 class GDataDownloadObserver;
 class GDataFileSystemInterface;
 class GDataSyncClient;
 class GDataUploader;
 
 // GDataSystemService runs the GData system, including the GData file system
 // implementation for the file manager, and some other sub systems.
 //
 // The class is essentially a container that manages lifetime of the objects
 // that are used to run the GData system. The GDataSystemService object is
 // created per-profile.
 class GDataSystemService : public ProfileKeyedService  {
  public:
   DriveServiceInterface* drive_service() { return drive_service_.get(); }
   DriveCache* cache() { return cache_; }
   GDataFileSystemInterface* file_system() { return file_system_.get(); }
   FileWriteHelper* file_write_helper() { return file_write_helper_.get(); }
   GDataUploader* uploader() { return uploader_.get(); }
-  GDataContactsService* contacts_service() { return contacts_service_.get(); }
   DriveWebAppsRegistry* webapps_registry() { return webapps_registry_.get(); }
 
   // Clears all the local cache files and in-memory data, and remounts the file
   // system.
   void ClearCacheAndRemountFileSystem(
       const base::Callback<void(bool)>& callback);
 
   // ProfileKeyedService override:
   virtual void Shutdown() OVERRIDE;
 
@@ skipping 21 matching lines @@
   Profile* profile_;
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
   DriveCache* cache_;
   scoped_ptr<DriveServiceInterface> drive_service_;
   scoped_ptr<GDataUploader> uploader_;
   scoped_ptr<DriveWebAppsRegistry> webapps_registry_;
   scoped_ptr<GDataFileSystemInterface> file_system_;
   scoped_ptr<FileWriteHelper> file_write_helper_;
   scoped_ptr<GDataDownloadObserver> download_observer_;
   scoped_ptr<GDataSyncClient> sync_client_;
-  scoped_ptr<GDataContactsService> contacts_service_;
   base::WeakPtrFactory<GDataSystemService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataSystemService);
 };
 
 // Singleton that owns all GDataSystemServices and associates them with
 // Profiles.
 class GDataSystemServiceFactory : public ProfileKeyedServiceFactory {
  public:
   // Returns the GDataSystemService for |profile|, creating it if it is not
@@ skipping 26 matching lines @@
   virtual ~GDataSystemServiceFactory();
 
   // ProfileKeyedServiceFactory:
   virtual ProfileKeyedService* BuildServiceInstanceFor(
       Profile* profile) const OVERRIDE;
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_SYSTEM_SERVICE_H_