Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / components / autofill / core / browser / webdata / autofill_profile_syncable_service.h

diff --git a/src/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h b/src/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h
index a29ff4f..715b40c 100644 (file)
--- a/src/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h
+++ b/src/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h
@@ -176,8 +176,7 @@ class AutofillProfileSyncableService
 
   // Calls merge_into->OverwriteWithOrAddTo() and then checks if the
   // |merge_into| has extra data. Returns |true| if |merge_into| posseses some
-  // multi-valued field values that are not in |merge_from| or if the origins
-  // of the two profiles differ, false otherwise.
+  // multi-valued field values that are not in |merge_from|.
   // TODO(isherman): Seems like this should return |true| if |merge_into| was
   // modified at all: http://crbug.com/248440
   static bool MergeProfile(const AutofillProfile& merge_from,