Move GUID utils to src/chrome/common.

chrome/browser/sync/glue/autofill_model_associator.cc

 // Copyright (c) 2010 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/autofill_model_associator.h"
 
 #include <vector>
 
+#include "base/guid.h"
 #include "base/task.h"
 #include "base/time.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/guid.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/glue/autofill_change_processor.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/protocol/autofill_specifics.pb.h"
 #include "chrome/browser/webdata/web_database.h"
 #include "net/base/escape.h"
 
 using base::TimeTicks;
 
@@ skipping 253 matching lines @@
     if (p1->Compare(*p2) == 0)
       return true;
     else
       return false;
   }
 };
 
 AutoFillProfile* AutofillModelAssociator::FindCorrespondingNodeFromWebDB(
     const sync_pb::AutofillProfileSpecifics& profile,
     const std::vector<AutoFillProfile*>& all_profiles_from_db) {
-  static std::string guid(guid::GenerateGUID());
+  static std::string guid(base::GenerateGUID());
   AutoFillProfile p;
   p.set_guid(guid);
   if (!FillProfileWithServerData(&p, profile)) {
     // Not a big deal. We encountered an error. Just say this profile does not
     // exist.
     LOG(ERROR) << " Profile could not be associated";
     return NULL;
   }
 
   // Now instantiate the functor and call find_if.
@@ skipping 34 matching lines @@
 
   scoped_ptr<AutoFillProfile> profile_in_web_db(FindCorrespondingNodeFromWebDB(
       profile, all_profiles_from_db));
 
   if (profile_in_web_db.get() != NULL) {
     int64 sync_id = node.GetId();
     std::string guid = profile_in_web_db->guid();
     Associate(&guid, sync_id);
     return;
   } else {  // Create a new node.
-    std::string guid = guid::GenerateGUID();
+    std::string guid = base::GenerateGUID();
     Associate(&guid, node.GetId());
     AutoFillProfile* p = new AutoFillProfile(guid);
     FillProfileWithServerData(p, profile);
     bundle->new_profiles.push_back(p);
   }
 }
 
 bool AutofillModelAssociator::DisassociateModels() {
   id_map_.clear();
   id_map_inverse_.clear();
@@ skipping 152 matching lines @@
   diff = MergeField(p, PHONE_HOME_WHOLE_NUMBER, s.phone_home_whole_number())
       || diff;
   return diff;
 }
 
 bool AutofillModelAssociator::HasNotMigratedYet() {
   return true;
 }
 
 }  // namespace browser_sync