summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browsing_data
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/browsing_data')
-rw-r--r--chrome/browser/browsing_data/browsing_data_database_helper.cc6
-rw-r--r--chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc4
-rw-r--r--chrome/browser/browsing_data/browsing_data_indexed_db_helper_browsertest.cc4
-rw-r--r--chrome/browser/browsing_data/browsing_data_indexed_db_helper_unittest.cc4
-rw-r--r--chrome/browser/browsing_data/browsing_data_remover_unittest.cc12
-rw-r--r--chrome/browser/browsing_data/cookies_tree_model.cc29
-rw-r--r--chrome/browser/browsing_data/cookies_tree_model_unittest.cc12
7 files changed, 37 insertions, 34 deletions
diff --git a/chrome/browser/browsing_data/browsing_data_database_helper.cc b/chrome/browser/browsing_data/browsing_data_database_helper.cc
index 891fe1b..29f65fd 100644
--- a/chrome/browser/browsing_data/browsing_data_database_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_database_helper.cc
@@ -91,8 +91,8 @@ void BrowsingDataDatabaseHelper::FetchDatabaseInfoOnFileThread() {
if (base::GetFileInfo(file_path, &file_info)) {
database_info_.push_back(DatabaseInfo(
identifier,
- UTF16ToUTF8(*db),
- UTF16ToUTF8(ori->GetDatabaseDescription(*db)),
+ base::UTF16ToUTF8(*db),
+ base::UTF16ToUTF8(ori->GetDatabaseDescription(*db)),
file_info.size,
file_info.last_modified));
}
@@ -120,7 +120,7 @@ void BrowsingDataDatabaseHelper::DeleteDatabaseOnFileThread(
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
if (!tracker_.get())
return;
- tracker_->DeleteDatabase(origin, UTF8ToUTF16(name),
+ tracker_->DeleteDatabase(origin, base::UTF8ToUTF16(name),
net::CompletionCallback());
}
diff --git a/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc b/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
index 6037323..cc56690 100644
--- a/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
@@ -33,8 +33,8 @@ class BrowsingDataDatabaseHelperTest : public InProcessBrowserTest {
webkit_database::DatabaseTracker* db_tracker =
BrowserContext::GetDefaultStoragePartition(browser()->profile())->
GetDatabaseTracker();
- base::string16 db_name = ASCIIToUTF16("db");
- base::string16 description = ASCIIToUTF16("db_description");
+ base::string16 db_name = base::ASCIIToUTF16("db");
+ base::string16 description = base::ASCIIToUTF16("db_description");
int64 size;
db_tracker->DatabaseOpened(kTestIdentifier1, db_name, description,
1, &size);
diff --git a/chrome/browser/browsing_data/browsing_data_indexed_db_helper_browsertest.cc b/chrome/browser/browsing_data/browsing_data_indexed_db_helper_browsertest.cc
index b851f50..049d4a8 100644
--- a/chrome/browser/browsing_data/browsing_data_indexed_db_helper_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_indexed_db_helper_browsertest.cc
@@ -27,7 +27,7 @@ typedef InProcessBrowserTest BrowsingDataIndexedDBHelperTest;
IN_PROC_BROWSER_TEST_F(BrowsingDataIndexedDBHelperTest, CannedAddIndexedDB) {
const GURL origin1("http://host1:1/");
const GURL origin2("http://host2:1/");
- const base::string16 description(ASCIIToUTF16("description"));
+ const base::string16 description(base::ASCIIToUTF16("description"));
scoped_refptr<CannedBrowsingDataIndexedDBHelper> helper(
new CannedBrowsingDataIndexedDBHelper());
@@ -52,7 +52,7 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataIndexedDBHelperTest, CannedAddIndexedDB) {
IN_PROC_BROWSER_TEST_F(BrowsingDataIndexedDBHelperTest, CannedUnique) {
const GURL origin("http://host1:1/");
- const base::string16 description(ASCIIToUTF16("description"));
+ const base::string16 description(base::ASCIIToUTF16("description"));
scoped_refptr<CannedBrowsingDataIndexedDBHelper> helper(
new CannedBrowsingDataIndexedDBHelper());
diff --git a/chrome/browser/browsing_data/browsing_data_indexed_db_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_indexed_db_helper_unittest.cc
index ae5bcc4..fc59ce6 100644
--- a/chrome/browser/browsing_data/browsing_data_indexed_db_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_indexed_db_helper_unittest.cc
@@ -14,7 +14,7 @@ typedef testing::Test CannedBrowsingDataIndexedDBHelperTest;
TEST_F(CannedBrowsingDataIndexedDBHelperTest, Empty) {
const GURL origin("http://host1:1/");
- const base::string16 description(ASCIIToUTF16("description"));
+ const base::string16 description(base::ASCIIToUTF16("description"));
scoped_refptr<CannedBrowsingDataIndexedDBHelper> helper(
new CannedBrowsingDataIndexedDBHelper());
@@ -29,7 +29,7 @@ TEST_F(CannedBrowsingDataIndexedDBHelperTest, Empty) {
TEST_F(CannedBrowsingDataIndexedDBHelperTest, IgnoreExtensionsAndDevTools) {
const GURL origin1("chrome-extension://abcdefghijklmnopqrstuvwxyz/");
const GURL origin2("chrome-devtools://abcdefghijklmnopqrstuvwxyz/");
- const base::string16 description(ASCIIToUTF16("description"));
+ const base::string16 description(base::ASCIIToUTF16("description"));
scoped_refptr<CannedBrowsingDataIndexedDBHelper> helper(
new CannedBrowsingDataIndexedDBHelper());
diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
index 99c3f73..5c9c7e7 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -489,12 +489,12 @@ class RemoveAutofillTester : public autofill::PersonalDataManagerObserver {
autofill::AutofillProfile profile;
profile.set_guid(base::GenerateGUID());
profile.set_origin(kWebOrigin);
- profile.SetRawInfo(autofill::NAME_FIRST, ASCIIToUTF16("Bob"));
- profile.SetRawInfo(autofill::NAME_LAST, ASCIIToUTF16("Smith"));
- profile.SetRawInfo(autofill::ADDRESS_HOME_ZIP, ASCIIToUTF16("94043"));
+ profile.SetRawInfo(autofill::NAME_FIRST, base::ASCIIToUTF16("Bob"));
+ profile.SetRawInfo(autofill::NAME_LAST, base::ASCIIToUTF16("Smith"));
+ profile.SetRawInfo(autofill::ADDRESS_HOME_ZIP, base::ASCIIToUTF16("94043"));
profile.SetRawInfo(autofill::EMAIL_ADDRESS,
- ASCIIToUTF16("sue@example.com"));
- profile.SetRawInfo(autofill::COMPANY_NAME, ASCIIToUTF16("Company X"));
+ base::ASCIIToUTF16("sue@example.com"));
+ profile.SetRawInfo(autofill::COMPANY_NAME, base::ASCIIToUTF16("Company X"));
profiles.push_back(profile);
profile.set_guid(base::GenerateGUID());
@@ -509,7 +509,7 @@ class RemoveAutofillTester : public autofill::PersonalDataManagerObserver {
card.set_guid(base::GenerateGUID());
card.set_origin(kWebOrigin);
card.SetRawInfo(autofill::CREDIT_CARD_NUMBER,
- ASCIIToUTF16("1234-5678-9012-3456"));
+ base::ASCIIToUTF16("1234-5678-9012-3456"));
cards.push_back(card);
card.set_guid(base::GenerateGUID());
diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc
index 184d587..a6c7372 100644
--- a/chrome/browser/browsing_data/cookies_tree_model.cc
+++ b/chrome/browser/browsing_data/cookies_tree_model.cc
@@ -279,7 +279,7 @@ CookiesTreeModel* CookieTreeNode::GetModel() const {
CookieTreeCookieNode::CookieTreeCookieNode(
std::list<net::CanonicalCookie>::iterator cookie)
- : CookieTreeNode(UTF8ToUTF16(cookie->Name())),
+ : CookieTreeNode(base::UTF8ToUTF16(cookie->Name())),
cookie_(cookie) {
}
@@ -302,7 +302,7 @@ CookieTreeNode::DetailedInfo CookieTreeCookieNode::GetDetailedInfo() const {
CookieTreeAppCacheNode::CookieTreeAppCacheNode(
const GURL& origin_url,
std::list<appcache::AppCacheInfo>::iterator appcache_info)
- : CookieTreeNode(UTF8ToUTF16(appcache_info->manifest_url.spec())),
+ : CookieTreeNode(base::UTF8ToUTF16(appcache_info->manifest_url.spec())),
origin_url_(origin_url),
appcache_info_(appcache_info) {
}
@@ -332,7 +332,7 @@ CookieTreeDatabaseNode::CookieTreeDatabaseNode(
std::list<BrowsingDataDatabaseHelper::DatabaseInfo>::iterator database_info)
: CookieTreeNode(database_info->database_name.empty() ?
l10n_util::GetStringUTF16(IDS_COOKIES_WEB_DATABASE_UNNAMED_NAME) :
- UTF8ToUTF16(database_info->database_name)),
+ base::UTF8ToUTF16(database_info->database_name)),
database_info_(database_info) {
}
@@ -358,7 +358,7 @@ CookieTreeNode::DetailedInfo CookieTreeDatabaseNode::GetDetailedInfo() const {
CookieTreeLocalStorageNode::CookieTreeLocalStorageNode(
std::list<BrowsingDataLocalStorageHelper::LocalStorageInfo>::iterator
local_storage_info)
- : CookieTreeNode(UTF8ToUTF16(local_storage_info->origin_url.spec())),
+ : CookieTreeNode(base::UTF8ToUTF16(local_storage_info->origin_url.spec())),
local_storage_info_(local_storage_info) {
}
@@ -386,7 +386,8 @@ CookieTreeLocalStorageNode::GetDetailedInfo() const {
CookieTreeSessionStorageNode::CookieTreeSessionStorageNode(
std::list<BrowsingDataLocalStorageHelper::LocalStorageInfo>::iterator
session_storage_info)
- : CookieTreeNode(UTF8ToUTF16(session_storage_info->origin_url.spec())),
+ : CookieTreeNode(
+ base::UTF8ToUTF16(session_storage_info->origin_url.spec())),
session_storage_info_(session_storage_info) {
}
@@ -411,7 +412,7 @@ CookieTreeSessionStorageNode::GetDetailedInfo() const {
CookieTreeIndexedDBNode::CookieTreeIndexedDBNode(
std::list<content::IndexedDBInfo>::iterator
indexed_db_info)
- : CookieTreeNode(UTF8ToUTF16(
+ : CookieTreeNode(base::UTF8ToUTF16(
indexed_db_info->origin_.spec())),
indexed_db_info_(indexed_db_info) {
}
@@ -438,7 +439,7 @@ CookieTreeNode::DetailedInfo CookieTreeIndexedDBNode::GetDetailedInfo() const {
CookieTreeFileSystemNode::CookieTreeFileSystemNode(
std::list<BrowsingDataFileSystemHelper::FileSystemInfo>::iterator
file_system_info)
- : CookieTreeNode(UTF8ToUTF16(
+ : CookieTreeNode(base::UTF8ToUTF16(
file_system_info->origin.spec())),
file_system_info_(file_system_info) {
}
@@ -464,7 +465,7 @@ CookieTreeNode::DetailedInfo CookieTreeFileSystemNode::GetDetailedInfo() const {
CookieTreeQuotaNode::CookieTreeQuotaNode(
std::list<BrowsingDataQuotaHelper::QuotaInfo>::iterator quota_info)
- : CookieTreeNode(UTF8ToUTF16(quota_info->host)),
+ : CookieTreeNode(base::UTF8ToUTF16(quota_info->host)),
quota_info_(quota_info) {
}
@@ -490,7 +491,7 @@ CookieTreeNode::DetailedInfo CookieTreeQuotaNode::GetDetailedInfo() const {
CookieTreeServerBoundCertNode::CookieTreeServerBoundCertNode(
net::ServerBoundCertStore::ServerBoundCertList::iterator cert)
- : CookieTreeNode(ASCIIToUTF16(cert->server_identifier())),
+ : CookieTreeNode(base::ASCIIToUTF16(cert->server_identifier())),
server_bound_cert_(cert) {
}
@@ -555,7 +556,8 @@ CookieTreeNode::DetailedInfo CookieTreeRootNode::GetDetailedInfo() const {
base::string16 CookieTreeHostNode::TitleForUrl(const GURL& url) {
const std::string file_origin_node_name(
std::string(chrome::kFileScheme) + content::kStandardSchemeSeparator);
- return UTF8ToUTF16(url.SchemeIsFile() ? file_origin_node_name : url.host());
+ return base::UTF8ToUTF16(url.SchemeIsFile() ? file_origin_node_name
+ : url.host());
}
CookieTreeHostNode::CookieTreeHostNode(const GURL& url)
@@ -1050,7 +1052,7 @@ void CookiesTreeModel::PopulateAppCacheInfoWithFilter(
notifier->StartBatchUpdate();
for (InfoByOrigin::iterator origin = container->appcache_info_.begin();
origin != container->appcache_info_.end(); ++origin) {
- base::string16 host_node_name = UTF8ToUTF16(origin->first.host());
+ base::string16 host_node_name = base::UTF8ToUTF16(origin->first.host());
if (filter.empty() ||
(host_node_name.find(filter) != base::string16::npos)) {
CookieTreeHostNode* host_node = root->GetOrCreateHostNode(origin->first);
@@ -1286,7 +1288,8 @@ void CookiesTreeModel::PopulateQuotaInfoWithFilter(
quota_info != container->quota_info_list_.end();
++quota_info) {
if (!filter.size() ||
- (UTF8ToUTF16(quota_info->host).find(filter) != base::string16::npos)) {
+ (base::UTF8ToUTF16(quota_info->host).find(filter) !=
+ base::string16::npos)) {
CookieTreeHostNode* host_node =
root->GetOrCreateHostNode(GURL("http://" + quota_info->host));
host_node->UpdateOrCreateQuotaNode(quota_info);
@@ -1303,7 +1306,7 @@ void CookiesTreeModel::PopulateFlashLSOInfoWithFilter(
if (container->flash_lso_domain_list_.empty())
return;
- std::string filter_utf8 = UTF16ToUTF8(filter);
+ std::string filter_utf8 = base::UTF16ToUTF8(filter);
notifier->StartBatchUpdate();
for (std::vector<std::string>::iterator it =
container->flash_lso_domain_list_.begin();
diff --git a/chrome/browser/browsing_data/cookies_tree_model_unittest.cc b/chrome/browser/browsing_data/cookies_tree_model_unittest.cc
index e1ac03a..b8dafda 100644
--- a/chrome/browser/browsing_data/cookies_tree_model_unittest.cc
+++ b/chrome/browser/browsing_data/cookies_tree_model_unittest.cc
@@ -1135,15 +1135,15 @@ TEST_F(CookiesTreeModelTest, FileSystemFilter) {
scoped_ptr<CookiesTreeModel> cookies_model(
CreateCookiesTreeModelWithInitialSample());
- cookies_model->UpdateSearchResults(ASCIIToUTF16("fshost1"));
+ cookies_model->UpdateSearchResults(base::ASCIIToUTF16("fshost1"));
EXPECT_EQ("http://fshost1:1/",
GetDisplayedFileSystems(cookies_model.get()));
- cookies_model->UpdateSearchResults(ASCIIToUTF16("fshost2"));
+ cookies_model->UpdateSearchResults(base::ASCIIToUTF16("fshost2"));
EXPECT_EQ("http://fshost2:2/",
GetDisplayedFileSystems(cookies_model.get()));
- cookies_model->UpdateSearchResults(ASCIIToUTF16("fshost3"));
+ cookies_model->UpdateSearchResults(base::ASCIIToUTF16("fshost3"));
EXPECT_EQ("http://fshost3:3/",
GetDisplayedFileSystems(cookies_model.get()));
@@ -1178,13 +1178,13 @@ TEST_F(CookiesTreeModelTest, CookiesFilter) {
mock_browsing_data_cookie_helper_->Notify();
EXPECT_EQ("A,B,C,D", GetDisplayedCookies(&cookies_model));
- cookies_model.UpdateSearchResults(base::string16(ASCIIToUTF16("foo")));
+ cookies_model.UpdateSearchResults(base::string16(base::ASCIIToUTF16("foo")));
EXPECT_EQ("B,C,D", GetDisplayedCookies(&cookies_model));
- cookies_model.UpdateSearchResults(base::string16(ASCIIToUTF16("2")));
+ cookies_model.UpdateSearchResults(base::string16(base::ASCIIToUTF16("2")));
EXPECT_EQ("A,C", GetDisplayedCookies(&cookies_model));
- cookies_model.UpdateSearchResults(base::string16(ASCIIToUTF16("foo3")));
+ cookies_model.UpdateSearchResults(base::string16(base::ASCIIToUTF16("foo3")));
EXPECT_EQ("D", GetDisplayedCookies(&cookies_model));
cookies_model.UpdateSearchResults(base::string16());
generated by cgit v1.1 at 2025-05-21 19:08:38 +0000