Move both instances of address_of into stl_util.

chrome/browser/autofill/personal_data_manager.cc

Index: chrome/browser/autofill/personal_data_manager.cc
diff --git a/chrome/browser/autofill/personal_data_manager.cc b/chrome/browser/autofill/personal_data_manager.cc
index 7ab1285b12b8687d93255789426392c5223da976..62946b50e7751888f257891b1a1413c286839332 100644
--- a/chrome/browser/autofill/personal_data_manager.cc
+++ b/chrome/browser/autofill/personal_data_manager.cc
@@ -6,8 +6,10 @@
 
 #include <algorithm>
 #include <iterator>
+#include <string>
 
 #include "base/logging.h"
+#include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill-inl.h"
@@ -59,20 +61,6 @@ bool FindByGUID(const C& container, const std::string& guid) {
       FormGroupMatchesByGUIDFunctor<T>(guid)) != container.end();
 }
 
-template<typename T>
-class DereferenceFunctor {
- public:
-  template<typename T_Iterator>
-  const T& operator()(const T_Iterator& iterator) {
-    return *iterator;
-  }
-};
-
-template<typename T>
-T* address_of(T& v) {
-  return &v;
-}
-
 bool IsValidEmail(const string16& value) {
   // This regex is more permissive than the official rfc2822 spec on the
   // subject, but it does reject obvious non-email addresses.