Checkpoint: android fixes towards compilation of unit_tests.

chrome/browser/sync/syncable/syncable.cc

Index: chrome/browser/sync/syncable/syncable.cc
diff --git a/chrome/browser/sync/syncable/syncable.cc b/chrome/browser/sync/syncable/syncable.cc
index ab120575e5b874e906233db3b5d08e0f2e448cfa..dc9193f575974b4de1448964e5d1d4ce4b3e5d18 100644
--- a/chrome/browser/sync/syncable/syncable.cc
+++ b/chrome/browser/sync/syncable/syncable.cc
@@ -1174,7 +1174,7 @@ class FullScanFilter : public IdFilter {
 class SomeIdsFilter : public IdFilter {
  public:
   virtual bool ShouldConsider(const Id& id) const {
-    return binary_search(ids_.begin(), ids_.end(), id);
+    return std::binary_search(ids_.begin(), ids_.end(), id);
   }
   std::vector<Id> ids_;
 };
@@ -1215,7 +1215,7 @@ bool Directory::CheckTreeInvariants(syncable::BaseTransaction* trans,
         return false;
       filter.ids_.push_back(e.Get(ID));
     }
-    sort(filter.ids_.begin(), filter.ids_.end());
+    std::sort(filter.ids_.begin(), filter.ids_.end());
     if (!CheckTreeInvariants(trans, handles, filter))
       return false;
   }