Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(316)

Side by Side Diff: chrome/browser/sync/glue/password_model_associator.cc

Issue 120983002: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync/glue/password_model_associator.h" 5 #include "chrome/browser/sync/glue/password_model_associator.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
11 #include "base/stl_util.h" 11 #include "base/stl_util.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "chrome/browser/password_manager/password_store.h" 13 #include "chrome/browser/password_manager/password_store.h"
14 #include "chrome/browser/sync/profile_sync_service.h" 14 #include "chrome/browser/sync/profile_sync_service.h"
15 #include "components/autofill/core/common/password_form.h" 15 #include "components/autofill/core/common/password_form.h"
16 #include "net/base/escape.h" 16 #include "net/base/escape.h"
17 #include "sync/api/sync_error.h" 17 #include "sync/api/sync_error.h"
18 #include "sync/internal_api/public/read_node.h" 18 #include "sync/internal_api/public/read_node.h"
19 #include "sync/internal_api/public/read_transaction.h" 19 #include "sync/internal_api/public/read_transaction.h"
20 #include "sync/internal_api/public/write_node.h" 20 #include "sync/internal_api/public/write_node.h"
21 #include "sync/internal_api/public/write_transaction.h" 21 #include "sync/internal_api/public/write_transaction.h"
22 #include "sync/protocol/password_specifics.pb.h" 22 #include "sync/protocol/password_specifics.pb.h"
23 23
24 using base::UTF8ToUTF16;
25 using base::UTF16ToUTF8;
24 using content::BrowserThread; 26 using content::BrowserThread;
25 27
26 namespace browser_sync { 28 namespace browser_sync {
27 29
28 const char kPasswordTag[] = "google_chrome_passwords"; 30 const char kPasswordTag[] = "google_chrome_passwords";
29 31
30 PasswordModelAssociator::PasswordModelAssociator( 32 PasswordModelAssociator::PasswordModelAssociator(
31 ProfileSyncService* sync_service, 33 ProfileSyncService* sync_service,
32 PasswordStore* password_store, 34 PasswordStore* password_store,
33 DataTypeErrorHandler* error_handler) 35 DataTypeErrorHandler* error_handler)
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 const std::string& password_element, 443 const std::string& password_element,
442 const std::string& signon_realm) { 444 const std::string& signon_realm) {
443 return net::EscapePath(origin_url) + "|" + 445 return net::EscapePath(origin_url) + "|" +
444 net::EscapePath(username_element) + "|" + 446 net::EscapePath(username_element) + "|" +
445 net::EscapePath(username_value) + "|" + 447 net::EscapePath(username_value) + "|" +
446 net::EscapePath(password_element) + "|" + 448 net::EscapePath(password_element) + "|" +
447 net::EscapePath(signon_realm); 449 net::EscapePath(signon_realm);
448 } 450 }
449 451
450 } // namespace browser_sync 452 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/generic_change_processor.cc ('k') | chrome/browser/sync/glue/session_model_associator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698