OLD | NEW |
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/importer/firefox3_importer.h" | 5 #include "chrome/browser/importer/firefox3_importer.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
559 s.ColumnBlobAsVector(1, &data); | 559 s.ColumnBlobAsVector(1, &data); |
560 if (data.empty()) | 560 if (data.empty()) |
561 continue; // Data definitely invalid. | 561 continue; // Data definitely invalid. |
562 | 562 |
563 if (!importer::ReencodeFavicon(&data[0], data.size(), &usage.png_data)) | 563 if (!importer::ReencodeFavicon(&data[0], data.size(), &usage.png_data)) |
564 continue; // Unable to decode. | 564 continue; // Unable to decode. |
565 | 565 |
566 usage.urls = i->second; | 566 usage.urls = i->second; |
567 favicons->push_back(usage); | 567 favicons->push_back(usage); |
568 } | 568 } |
569 s.Reset(); | 569 s.Reset(true); |
570 } | 570 } |
571 } | 571 } |
OLD | NEW |