Checkpoint: android fixes towards compilation of unit_tests.

chrome/browser/sync/syncable/syncable.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/sync/syncable/syncable.h"
 
 #include <algorithm>
 #include <cstring>
 #include <functional>
 #include <iomanip>
@@ skipping 1156 matching lines @@
 class FullScanFilter : public IdFilter {
  public:
   virtual bool ShouldConsider(const Id& id) const {
     return true;
   }
 };
 
 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_;
 };
 
 bool Directory::CheckTreeInvariants(syncable::BaseTransaction* trans,
                                     const EntryKernelMutationMap& mutations) {
   MetahandleSet handles;
   SomeIdsFilter filter;
   filter.ids_.reserve(mutations.size());
   for (EntryKernelMutationMap::const_iterator it = mutations.begin(),
@@ skipping 20 matching lines @@
       return false;
   } else {
     SomeIdsFilter filter;
     MetahandleSet::iterator i;
     for (i = handles.begin() ; i != handles.end() ; ++i) {
       Entry e(trans, GET_BY_HANDLE, *i);
       if (!SyncAssert(e.good(), FROM_HERE, "Entry is bad", 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;
   }
   return true;
 }
 
 bool Directory::CheckTreeInvariants(syncable::BaseTransaction* trans,
                                     const MetahandleSet& handles,
                                     const IdFilter& idfilter) {
   const int64 max_ms = kInvariantCheckMaxMs;
@@ skipping 1148 matching lines @@
     if (entry->ref(NEXT_ID).IsRoot() ||
         entry->ref(NEXT_ID) != entry->ref(PREV_ID)) {
       return entry;
     }
   }
   // There were no children in the linked list.
   return NULL;
 }
 
 }  // namespace syncable