| Index: chrome/browser/sync/glue/bookmark_model_associator.cc
|
| diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc
|
| index fbbf8c34f3769067136e56edf1e8f808093574d4..6d9d96aaafbda9d6ba70aef91a5b661276bacce0 100644
|
| --- a/chrome/browser/sync/glue/bookmark_model_associator.cc
|
| +++ b/chrome/browser/sync/glue/bookmark_model_associator.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
|
| +// 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.
|
|
|
| @@ -9,6 +9,7 @@
|
| #include "base/hash_tables.h"
|
| #include "base/message_loop.h"
|
| #include "base/task.h"
|
| +#include "base/utf_string_conversions.h"
|
| #include "chrome/browser/bookmarks/bookmark_model.h"
|
| #include "chrome/browser/chrome_thread.h"
|
| #include "chrome/browser/profile.h"
|
| @@ -93,7 +94,7 @@ const BookmarkNode* BookmarkNodeFinder::FindBookmarkNode(
|
| const sync_api::BaseNode& sync_node) {
|
| // Create a bookmark node from the given sync node.
|
| BookmarkNode temp_node(sync_node.GetURL());
|
| - temp_node.SetTitle(sync_node.GetTitle());
|
| + temp_node.SetTitle(WideToUTF16Hack(sync_node.GetTitle()));
|
| if (sync_node.GetIsFolder())
|
| temp_node.set_type(BookmarkNode::FOLDER);
|
| else
|
|
|