Reland of https://codereview.chromium.org/13891016/. This includes the fix for the Segfault on Chro…

chrome/browser/sync_file_system/drive_file_sync_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_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_
 
 #include <deque>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
-#include "base/callback_forward.h"
+#include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/non_thread_safe.h"
-#include "base/timer.h"
 #include "chrome/browser/google_apis/drive_notification_observer.h"
 #include "chrome/browser/sync_file_system/drive_file_sync_client_interface.h"
 #include "chrome/browser/sync_file_system/drive_metadata_store.h"
 #include "chrome/browser/sync_file_system/local_change_processor.h"
 #include "chrome/browser/sync_file_system/remote_file_sync_service.h"
 #include "webkit/fileapi/syncable/file_change.h"
 #include "webkit/fileapi/syncable/sync_action.h"
 #include "webkit/fileapi/syncable/sync_callbacks.h"
 #include "webkit/fileapi/syncable/sync_direction.h"
 #include "webkit/fileapi/syncable/sync_status_code.h"
@@ skipping 75 matching lines @@
       const base::FilePath& local_file_path,
       const SyncFileMetadata& local_file_metadata,
       const fileapi::FileSystemURL& url,
       const SyncStatusCallback& callback) OVERRIDE;
 
   // DriveFileSyncClientObserver overrides.
   virtual void OnAuthenticated() OVERRIDE;
   virtual void OnNetworkConnected() OVERRIDE;
 
   // google_apis::DriveNotificationObserver implementation.
-  virtual void CheckForUpdates() OVERRIDE;
+  virtual void OnNotificationReceived() OVERRIDE;
 
  private:
   friend class DriveFileSyncServiceMockTest;
   friend class DriveFileSyncServiceSyncTest;
   class TaskToken;
   struct ApplyLocalChangeParam;
   struct ProcessRemoteChangeParam;
 
   enum RemoteSyncType {
     // Smaller number indicates higher priority in ChangeQueue.
@@ skipping 311 matching lines @@
   // These two methods are called only from this method.
   void MaybeStartFetchChanges();
 
   void FetchChangesForIncrementalSync();
   void DidFetchChangesForIncrementalSync(
       scoped_ptr<TaskToken> token,
       bool has_new_changes,
       google_apis::GDataErrorCode error,
       scoped_ptr<google_apis::ResourceList> changes);
   bool GetOriginForEntry(const google_apis::ResourceEntry& entry, GURL* origin);
-  void SchedulePolling();
-  void OnPollingTimerFired();
-  void UpdatePollingDelay(int64 new_delay_sec);
   void NotifyObserversFileStatusChanged(const fileapi::FileSystemURL& url,
                                         SyncFileStatus sync_status,
                                         SyncAction action_taken,
                                         SyncDirection direction);
 
   void HandleSyncRootDirectoryChange(const google_apis::ResourceEntry& entry);
   void HandleOriginRootDirectoryChange(const google_apis::ResourceEntry& entry);
 
   void EnsureSyncRootDirectory(const ResourceIdCallback& callback);
   void DidEnsureSyncRoot(const ResourceIdCallback& callback,
@@ skipping 41 matching lines @@
 
   std::set<GURL> pending_batch_sync_origins_;
 
   // Absence of |token_| implies a task is running. Incoming tasks should
   // wait for the task to finish in |pending_tasks_| if |token_| is null.
   // Each task must take TaskToken instance from |token_| and must hold it
   // until it finished. And the task must return the instance through
   // NotifyTaskDone when the task finished.
   scoped_ptr<TaskToken> token_;
 
-  // Timer to trigger fetching changes for incremental sync.
-  base::OneShotTimer<DriveFileSyncService> polling_timer_;
-  // If polling_delay_seconds_ is negative (<0) the timer won't start.
-  int64 polling_delay_seconds_;
-
   // Is set to true when there's a fair possibility that we have some
   // remote changes that haven't been fetched yet.
   //
   // This flag is set when:
   // - This gets invalidation notification,
   // - The service is authenticated or becomes online, and
   // - The polling timer is fired.
   //
   // This flag is cleared when:
   // - A batch or incremental sync has been started, and
@@ skipping 10 matching lines @@
   // Use WeakPtrFactory instead of SupportsWeakPtr to revoke the weak pointer
   // in |token_|.
   base::WeakPtrFactory<DriveFileSyncService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DriveFileSyncService);
 };
 
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_