Original patch by rlarocque@chromium.org at http://codereview.chromium.org/7633077/

chrome/browser/sync/glue/password_model_associator.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 "chrome/browser/sync/glue/password_model_associator.h"
 
 #include <set>
 
 #include "base/stl_util.h"
 #include "base/tracked.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/sync/api/sync_error.h"
-#include "chrome/browser/sync/engine/syncapi.h"
+#include "chrome/browser/sync/internal_api/read_node.h"
+#include "chrome/browser/sync/internal_api/read_transaction.h"
+#include "chrome/browser/sync/internal_api/write_node.h"
+#include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/protocol/password_specifics.pb.h"
 #include "net/base/escape.h"
 #include "webkit/glue/password_form.h"
 
 namespace browser_sync {
 
 const char kPasswordTag[] = "google_chrome_passwords";
 
 PasswordModelAssociator::PasswordModelAssociator(
@@ skipping 393 matching lines @@
     const std::string& password_element,
     const std::string& signon_realm) {
   return EscapePath(origin_url) + "|" +
          EscapePath(username_element) + "|" +
          EscapePath(username_value) + "|" +
          EscapePath(password_element) + "|" +
          EscapePath(signon_realm);
 }
 
 }  // namespace browser_sync