| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/bookmarks/browser/bookmark_storage.h" | 5 #include "components/bookmarks/browser/bookmark_storage.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/json/json_file_value_serializer.h" | 10 #include "base/json/json_file_value_serializer.h" |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 } | 198 } |
| 199 | 199 |
| 200 bool BookmarkStorage::SaveNow() { | 200 bool BookmarkStorage::SaveNow() { |
| 201 if (!model_ || !model_->loaded()) { | 201 if (!model_ || !model_->loaded()) { |
| 202 // We should only get here if we have a valid model and it's finished | 202 // We should only get here if we have a valid model and it's finished |
| 203 // loading. | 203 // loading. |
| 204 NOTREACHED(); | 204 NOTREACHED(); |
| 205 return false; | 205 return false; |
| 206 } | 206 } |
| 207 | 207 |
| 208 std::string data; | 208 scoped_ptr<std::string> data(new std::string); |
| 209 if (!SerializeData(&data)) | 209 if (!SerializeData(data.get())) |
| 210 return false; | 210 return false; |
| 211 writer_.WriteNow(data); | 211 writer_.WriteNow(data.Pass()); |
| 212 return true; | 212 return true; |
| 213 } | 213 } |
| 214 | 214 |
| 215 } // namespace bookmarks | 215 } // namespace bookmarks |
| OLD | NEW |