Fix unit-tests compilation on Android.

chrome/browser/sync/glue/session_model_associator.cc

 // 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.
 
 #include "chrome/browser/sync/glue/session_model_associator.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 449 matching lines @@
                                  current_index - kMaxSyncNavigationCount);
   const int max_index = std::min(current_index + kMaxSyncNavigationCount,
                                  new_tab.GetEntryCount());
   const int pending_index = new_tab.GetPendingEntryIndex();
   sync_tab->set_pinned(window.IsTabPinned(&new_tab));
   if (new_tab.HasExtensionAppId()) {
     sync_tab->set_extension_app_id(new_tab.GetExtensionAppId());
   }
 
   sync_tab->mutable_navigation()->Clear();
-  std::vector<SyncedTabNavigation>::const_iterator prev_nav_iter;
+  std::vector<SyncedTabNavigation>::const_iterator prev_nav_iter =
+      prev_tab->synced_tab_navigations.begin();
   for (int i = min_index; i < max_index; ++i) {
     const NavigationEntry* entry = (i == pending_index) ?
        new_tab.GetPendingEntry() : new_tab.GetEntryAtIndex(i);
     DCHECK(entry);
     if (i == min_index) {
       // Find the location of the first navigation within the previous list of
       // navigations. We only need to do this once, as all subsequent
       // navigations are either contiguous or completely new.
-      for (prev_nav_iter = prev_tab->synced_tab_navigations.begin();
-           prev_nav_iter != prev_tab->synced_tab_navigations.end();
+      for (;prev_nav_iter != prev_tab->synced_tab_navigations.end();
            ++prev_nav_iter) {
         if (prev_nav_iter->unique_id() == entry->GetUniqueID())
           break;
       }
     }
     if (entry->GetVirtualURL().is_valid()) {
       if (i == current_index) {
         *new_url = GURL(entry->GetVirtualURL().spec());
         DVLOG(1) << "Associating local tab " << new_tab.GetSessionId()
                  << " with url " << new_url->spec() << " and title "
@@ skipping 1051 matching lines @@
 bool SessionModelAssociator::CryptoReadyIfNecessary() {
   // We only access the cryptographer while holding a transaction.
   sync_api::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());
   const syncable::ModelTypeSet encrypted_types =
       sync_api::GetEncryptedTypes(&trans);
   return !encrypted_types.Has(SESSIONS) ||
          sync_service_->IsCryptographerReady(&trans);
 }
 
 }  // namespace browser_sync