Towards an android build of sync_unit_tests

BUG=
TEST=


Review URL: http://codereview.chromium.org/9346009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120930 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 12 insertions, 11 deletions

diff --git a/chrome/browser/automation/automation_provider_list.cc b/chrome/browser/automation/automation_provider_list.cc
index 540a91e..6cd1f99 100644
--- a/chrome/browser/automation/automation_provider_list.cc
+++ b/chrome/browser/automation/automation_provider_list.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -28,7 +28,8 @@ bool AutomationProviderList::AddProvider(AutomationProvider* provider) {
 
 bool AutomationProviderList::RemoveProvider(AutomationProvider* provider) {
   const iterator remove_provider =
-    find(automation_providers_.begin(), automation_providers_.end(), provider);
+    std::find(automation_providers_.begin(), automation_providers_.end(),
+              provider);
   if (remove_provider != automation_providers_.end()) {
     (*remove_provider)->Release();
     automation_providers_.erase(remove_provider);
diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc
index 3b02deb..b12fdbb 100644
--- a/chrome/browser/cookies_tree_model.cc
+++ b/chrome/browser/cookies_tree_model.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -328,10 +328,10 @@ CookieTreeOriginNode* CookieTreeRootNode::GetOrCreateOriginNode(
 
   // First see if there is an existing match.
   std::vector<CookieTreeNode*>::iterator origin_node_iterator =
-      lower_bound(children().begin(),
-                  children().end(),
-                  &origin_node,
-                  OriginNodeComparator());
+      std::lower_bound(children().begin(),
+                       children().end(),
+                       &origin_node,
+                       OriginNodeComparator());
 
   if (origin_node_iterator != children().end() &&
       WideToUTF16Hack(CookieTreeOriginNode::TitleForUrl(url)) ==
@@ -596,10 +596,10 @@ bool CookieTreeNode::NodeTitleComparator::operator() (
 void CookieTreeNode::AddChildSortedByTitle(CookieTreeNode* new_child) {
   DCHECK(new_child);
   std::vector<CookieTreeNode*>::iterator iter =
-      lower_bound(children().begin(),
-                  children().end(),
-                  new_child,
-                  NodeTitleComparator());
+      std::lower_bound(children().begin(),
+                       children().end(),
+                       new_child,
+                       NodeTitleComparator());
   GetModel()->Add(this, new_child, iter - children().begin());
 }