Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync_file_system / drive_backend / conflict_resolver.cc

diff --git a/src/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc b/src/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
index 340c173..51db349 100644 (file)
--- a/src/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
+++ b/src/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
@@ -43,7 +43,6 @@ void ConflictResolver::RunPreflight(scoped_ptr<SyncTaskToken> token) {
 
 void ConflictResolver::RunExclusive(scoped_ptr<SyncTaskToken> token) {
   if (!IsContextReady()) {
-    NOTREACHED();
     SyncTaskManager::NotifyTaskDone(token.Pass(), SYNC_STATUS_FAILED);
     return;
   }