[SyncFS] Force activate folder tracker on folder creation conflict case

chrome/browser/sync_file_system/drive_backend/metadata_database.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_METADATA_DATABASE_H_
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_METADATA_DATABASE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 107 matching lines @@
   typedef std::map<std::string, FileTracker*> TrackerByAppID;
   typedef std::vector<std::string> FileIDList;
 
   typedef base::Callback<
       void(SyncStatusCode status, scoped_ptr<MetadataDatabase> instance)>
       CreateCallback;
 
   enum ActivationStatus {
     ACTIVATION_PENDING,
     ACTIVATION_FAILED_ANOTHER_ACTIVE_TRACKER,
-    ACTIVATION_FAILED_SAME_PATH_TRACKER,
   };
 
   enum UpdateOption {
     UPDATE_TRACKER_FOR_UNSYNCED_FILE,
     UPDATE_TRACKER_FOR_SYNCED_FILE,
   };
 
   // The entry point of the MetadataDatabase for production code.
   // If |env_override| is non-NULL, internal LevelDB uses |env_override| instead
   // of leveldb::Env::Default().  Use leveldb::MemEnv in test code for faster
@@ skipping 158 matching lines @@
   // If the tracker has no further change to sync, unmarks its dirty flag.
   void PopulateFolderByChildList(const std::string& folder_id,
                                  const FileIDList& child_file_ids,
                                  const SyncStatusCallback& callback);
 
   // Updates |synced_details| of the tracker with |updated_details|.
   void UpdateTracker(int64 tracker_id,
                      const FileDetails& updated_details,
                      const SyncStatusCallback& callback);
 
-  // Returns ACTIVATION_PENDING if a tracker of the file can be safely activated
-  // without deactivating any other trackers.  In this case, tries to activate
-  // the tracker, and invokes |callback| upon completion.
-  // Returns ACTIVATION_FAILED_ANOTHER_ACTIVE_TRACKER if there's another active
-  // tracker that tracks |file_id|.
-  // Returns ACTIVATION_FAILED_SAME_PATH_TRACKER if there's another active
-  // tracker that has the same parent tracker and title to |file_id|.
-  // In these FAILED cases, |callback| is not invoked.
-  ActivationStatus TryNoSideEffectActivation(
-      int64 parent_tracker_id,
-      const std::string& file_id,
-      const SyncStatusCallback& callback);
+  // Activates a tracker identified by |parent_tracker_id| and |file_id| if the
+  // tracker can be activated without inactivating other trackers that has the

[kinuko, 2014/02/07 08:00:21]

nit: has -> have

[tzik, 2014/02/10 02:38:58]

Done.

+  // same |file_id| but a different path.

[kinuko, 2014/02/07 08:00:21]

a different path -> different paths

[tzik, 2014/02/10 02:38:58]

Done.

+  // If |file_id| has another active tracker, the function returns
+  // ACTIVATION_FAILED_ANOTHER_ACTIVE_TRACKER and does not invoke |callback|.
+  // If there is another active tracker that has the same path but different
+  // |file_id|, inactivates the tracker.
+  // In success case, returns ACTIVATION_PENDING and invokes |callback| upon
+  // completion.
+  //
+  // The tracker to be activated must:
+  //  - have a tracked metadata in the database,
+  //  - have |synced_details| with valid |title|.
+  ActivationStatus TryActivateTracker(int64 parent_tracker_id,
+                                      const std::string& file_id,
+                                      const SyncStatusCallback& callback);
 
   // Changes the priority of the tracker to low.
   void LowerTrackerPriority(int64 tracker_id);
   void PromoteLowerPriorityTrackersToNormal();
 
   // Returns true if there is a normal priority dirty tracker.
   // Assigns the dirty tracker if exists and |tracker| is non-NULL.
   bool GetNormalPriorityDirtyTracker(FileTracker* tracker) const;
 
   // Returns true if there is a low priority dirty tracker.
@@ skipping 173 matching lines @@
 
   base::WeakPtrFactory<MetadataDatabase> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MetadataDatabase);
 };
 
 }  // namespace drive_backend
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_METADATA_DATABASE_H_