Fix for failing unit tests PasswordStoreDefaultTest.*

chrome/browser/password_manager/password_form_data.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 "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_form_data.h"
 
 using webkit::forms::PasswordForm;
 
@@ skipping 58 matching lines @@
             << "date_created: " << form.date_created.ToDoubleT();
 }
 
 typedef std::set<const webkit::forms::PasswordForm*> SetOfForms;
 
 bool ContainsSamePasswordFormsPtr(
     const std::vector<PasswordForm*>& first,
     const std::vector<PasswordForm*>& second) {
   if (first.size() != second.size())
     return false;
-  SetOfForms expectations(first.begin(), first.end());
+
+  // TODO(cramya): As per b/7079906, the STLport of Android causes a crash
+  // if we use expectations(first.begin(), first.end()) to copy a vector
+  // into a set rather than std::copy that is used below.
+  // Need to revert this once STLport is fixed.
+  SetOfForms expectations;
+  std::copy(first.begin(), first.end(), std::inserter(expectations,
+                                                      expectations.begin()));
   for (unsigned int i = 0; i < second.size(); ++i) {
     const PasswordForm* actual = second[i];
     bool found_match = false;
     for (SetOfForms::iterator it = expectations.begin();
          it != expectations.end(); ++it) {
       const PasswordForm* expected = *it;
       if (*expected == *actual) {
         found_match = true;
         expectations.erase(it);
         break;
@@ skipping 13 matching lines @@
   std::vector<PasswordForm*> first_ptr;
   for (unsigned int i = 0; i < first.size(); ++i) {
     first_ptr.push_back(&first[i]);
   }
   std::vector<PasswordForm*> second_ptr;
   for (unsigned int i = 0; i < second.size(); ++i) {
     second_ptr.push_back(&second[i]);
   }
   return ContainsSamePasswordFormsPtr(first_ptr, second_ptr);
 }