Commit cb440072 authored by tfarina@chromium.org's avatar tfarina@chromium.org

Move BookmarkCodec into bookmarks namespace.

BUG=370433
TEST=None
R=sky@chromium.org

Review URL: https://codereview.chromium.org/348563003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278503 0039d316-1c4b-4281-b951-d872f2087c98
parent cfc5ec61
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/favicon_size.h" #include "ui/gfx/favicon_size.h"
using bookmarks::BookmarkCodec;
using content::BrowserThread; using content::BrowserThread;
namespace { namespace {
......
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
using base::Time; using base::Time;
namespace bookmarks {
const char* BookmarkCodec::kRootsKey = "roots"; const char* BookmarkCodec::kRootsKey = "roots";
const char* BookmarkCodec::kRootFolderNameKey = "bookmark_bar"; const char* BookmarkCodec::kRootFolderNameKey = "bookmark_bar";
const char* BookmarkCodec::kOtherBookmarkFolderNameKey = "other"; const char* BookmarkCodec::kOtherBookmarkFolderNameKey = "other";
...@@ -487,3 +489,5 @@ void BookmarkCodec::FinalizeChecksum() { ...@@ -487,3 +489,5 @@ void BookmarkCodec::FinalizeChecksum() {
base::MD5Final(&digest, &md5_context_); base::MD5Final(&digest, &md5_context_);
computed_checksum_ = base::MD5DigestToBase16(digest); computed_checksum_ = base::MD5DigestToBase16(digest);
} }
} // namespace bookmarks
...@@ -21,6 +21,8 @@ class ListValue; ...@@ -21,6 +21,8 @@ class ListValue;
class Value; class Value;
} }
namespace bookmarks {
// BookmarkCodec is responsible for encoding and decoding the BookmarkModel // BookmarkCodec is responsible for encoding and decoding the BookmarkModel
// into JSON values. The encoded values are written to disk via the // into JSON values. The encoded values are written to disk via the
// BookmarkStorage. // BookmarkStorage.
...@@ -204,4 +206,6 @@ class BookmarkCodec { ...@@ -204,4 +206,6 @@ class BookmarkCodec {
DISALLOW_COPY_AND_ASSIGN(BookmarkCodec); DISALLOW_COPY_AND_ASSIGN(BookmarkCodec);
}; };
} // namespace bookmarks
#endif // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_CODEC_H_ #endif // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_CODEC_H_
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
using base::ASCIIToUTF16; using base::ASCIIToUTF16;
namespace bookmarks {
namespace { namespace {
const char kUrl1Title[] = "url1"; const char kUrl1Title[] = "url1";
...@@ -473,3 +474,5 @@ TEST_F(BookmarkCodecTest, CanDecodeMetaInfoAsString) { ...@@ -473,3 +474,5 @@ TEST_F(BookmarkCodecTest, CanDecodeMetaInfoAsString) {
EXPECT_TRUE(bbn->GetChild(0)->GetMetaInfo(kNestedKey, &meta_value)); EXPECT_TRUE(bbn->GetChild(0)->GetMetaInfo(kNestedKey, &meta_value));
EXPECT_EQ("value3", meta_value); EXPECT_EQ("value3", meta_value);
} }
} // namespace bookmarks
...@@ -32,6 +32,7 @@ class SequencedTaskRunner; ...@@ -32,6 +32,7 @@ class SequencedTaskRunner;
} }
namespace bookmarks { namespace bookmarks {
class BookmarkCodecTest;
class BookmarkExpandedStateTracker; class BookmarkExpandedStateTracker;
class BookmarkIndex; class BookmarkIndex;
class BookmarkLoadDetails; class BookmarkLoadDetails;
...@@ -287,8 +288,7 @@ class BookmarkModel : public KeyedService { ...@@ -287,8 +288,7 @@ class BookmarkModel : public KeyedService {
BookmarkClient* client() const { return client_; } BookmarkClient* client() const { return client_; }
private: private:
friend class BookmarkCodecTest; friend class bookmarks::BookmarkCodecTest;
friend class BookmarkModelTest;
friend class bookmarks::BookmarkStorage; friend class bookmarks::BookmarkStorage;
friend class bookmarks::ScopedGroupBookmarkActions; friend class bookmarks::ScopedGroupBookmarkActions;
friend class test::TestBookmarkClient; friend class test::TestBookmarkClient;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment