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

Side by Side Diff: content/browser/dom_storage/session_storage_database_unittest.cc

Issue 121033002: Update uses of UTF conversions in content/ 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 5
6 #include "content/browser/dom_storage/session_storage_database.h" 6 #include "content/browser/dom_storage/session_storage_database.h"
7 7
8 #include <algorithm> 8 #include <algorithm>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 80
81 DISALLOW_COPY_AND_ASSIGN(SessionStorageDatabaseTest); 81 DISALLOW_COPY_AND_ASSIGN(SessionStorageDatabaseTest);
82 }; 82 };
83 83
84 SessionStorageDatabaseTest::SessionStorageDatabaseTest() 84 SessionStorageDatabaseTest::SessionStorageDatabaseTest()
85 : kOrigin1("http://www.origin1.com"), 85 : kOrigin1("http://www.origin1.com"),
86 kOrigin2("http://www.origin2.com"), 86 kOrigin2("http://www.origin2.com"),
87 kNamespace1("namespace1"), 87 kNamespace1("namespace1"),
88 kNamespace2("namespace2"), 88 kNamespace2("namespace2"),
89 kNamespaceClone("wascloned"), 89 kNamespaceClone("wascloned"),
90 kKey1(ASCIIToUTF16("key1")), 90 kKey1(base::ASCIIToUTF16("key1")),
91 kKey2(ASCIIToUTF16("key2")), 91 kKey2(base::ASCIIToUTF16("key2")),
92 kKey3(ASCIIToUTF16("key3")), 92 kKey3(base::ASCIIToUTF16("key3")),
93 kValue1(ASCIIToUTF16("value1"), false), 93 kValue1(base::ASCIIToUTF16("value1"), false),
94 kValue2(ASCIIToUTF16("value2"), false), 94 kValue2(base::ASCIIToUTF16("value2"), false),
95 kValue3(ASCIIToUTF16("value3"), false), 95 kValue3(base::ASCIIToUTF16("value3"), false),
96 kValue4(ASCIIToUTF16("value4"), false) { } 96 kValue4(base::ASCIIToUTF16("value4"), false) { }
97 97
98 SessionStorageDatabaseTest::~SessionStorageDatabaseTest() { } 98 SessionStorageDatabaseTest::~SessionStorageDatabaseTest() { }
99 99
100 void SessionStorageDatabaseTest::SetUp() { 100 void SessionStorageDatabaseTest::SetUp() {
101 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); 101 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
102 ResetDatabase(); 102 ResetDatabase();
103 } 103 }
104 104
105 void SessionStorageDatabaseTest::ResetDatabase() { 105 void SessionStorageDatabaseTest::ResetDatabase() {
106 db_ = new SessionStorageDatabase(temp_dir_.path()); 106 db_ = new SessionStorageDatabase(temp_dir_.path());
(...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after
789 ASSERT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin2, false, data2)); 789 ASSERT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin2, false, data2));
790 790
791 EXPECT_TRUE(db_->DeleteArea(kNamespace1, kOrigin1)); 791 EXPECT_TRUE(db_->DeleteArea(kNamespace1, kOrigin1));
792 EXPECT_TRUE(db_->DeleteArea(kNamespace1, kOrigin2)); 792 EXPECT_TRUE(db_->DeleteArea(kNamespace1, kOrigin2));
793 // Check that also the namespace start key was deleted. 793 // Check that also the namespace start key was deleted.
794 CheckDatabaseConsistency(); 794 CheckDatabaseConsistency();
795 } 795 }
796 796
797 797
798 } // namespace content 798 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/dom_storage/session_storage_database.cc ('k') | content/browser/download/download_item_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698