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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/importer/firefox_importer_unittest.cc

Issue 6746014: importer: Cleanup, remove all remaining using declarations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/importer/ie_importer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/importer/firefox_importer_unittest.cc
diff --git a/chrome/browser/importer/firefox_importer_unittest.cc b/chrome/browser/importer/firefox_importer_unittest.cc
index c1033defacddf293fd1158fa96ffc705e15bf3eb..c071efe96b16d49cfb0034b52e21f131454f0d2f 100644
--- a/chrome/browser/importer/firefox_importer_unittest.cc
+++ b/chrome/browser/importer/firefox_importer_unittest.cc
@@ -15,8 +15,6 @@
#include "chrome/browser/importer/nss_decryptor.h"
#include "chrome/common/chrome_paths.h"
-using base::Time;
-
// The following 2 tests require the use of the NSSDecryptor, on OSX this needs
// to run in a separate process, so we use a proxy object so we can share the
// same test between platforms.
@@ -85,7 +83,7 @@ TEST(FirefoxImporterTest, Firefox2BookmarkParse) {
// Escaped characters in name.
string16 folder_name;
bool is_toolbar_folder;
- Time folder_add_date;
+ base::Time folder_add_date;
result = Firefox2Importer::ParseFolderNameFromLine(
"<DT><H3 ADD_DATE=\"1207558707\" >&lt; &gt;"
" &amp; &quot; &#39; \\ /</H3>",
@@ -93,7 +91,7 @@ TEST(FirefoxImporterTest, Firefox2BookmarkParse) {
EXPECT_TRUE(result);
EXPECT_EQ(ASCIIToUTF16("< > & \" ' \\ /"), folder_name);
EXPECT_FALSE(is_toolbar_folder);
- EXPECT_TRUE(Time::FromTimeT(1207558707) == folder_add_date);
+ EXPECT_TRUE(base::Time::FromTimeT(1207558707) == folder_add_date);
// Empty name and toolbar folder attribute.
result = Firefox2Importer::ParseFolderNameFromLine(
@@ -108,7 +106,7 @@ TEST(FirefoxImporterTest, Firefox2BookmarkParse) {
GURL url, favicon;
string16 shortcut;
string16 post_data;
- Time add_date;
+ base::Time add_date;
result = Firefox2Importer::ParseBookmarkFromLine(
"<DT><A HREF=\"http://chinese.site.cn/path?query=1#ref\" "
"SHORTCUTURL=\"\xE4\xB8\xAD\">\xE4\xB8\xAD\xE6\x96\x87</A>",
@@ -118,7 +116,7 @@ TEST(FirefoxImporterTest, Firefox2BookmarkParse) {
EXPECT_EQ("http://chinese.site.cn/path?query=1#ref", url.spec());
EXPECT_EQ(L"\x4E2D", UTF16ToWide(shortcut));
EXPECT_EQ(ASCIIToUTF16(""), post_data);
- EXPECT_TRUE(Time() == add_date);
+ EXPECT_TRUE(base::Time() == add_date);
// No shortcut, and url contains %22 ('"' character).
result = Firefox2Importer::ParseBookmarkFromLine(
@@ -129,7 +127,7 @@ TEST(FirefoxImporterTest, Firefox2BookmarkParse) {
EXPECT_EQ("http://domain.com/?q=%22%3C%3E%22", url.spec());
EXPECT_EQ(ASCIIToUTF16(""), shortcut);
EXPECT_EQ(ASCIIToUTF16(""), post_data);
- EXPECT_TRUE(Time() == add_date);
+ EXPECT_TRUE(base::Time() == add_date);
result = Firefox2Importer::ParseBookmarkFromLine(
"<DT><A HREF=\"http://domain.com/?g=&quot;\"\">name</A>",
@@ -139,7 +137,7 @@ TEST(FirefoxImporterTest, Firefox2BookmarkParse) {
EXPECT_EQ("http://domain.com/?g=%22", url.spec());
EXPECT_EQ(ASCIIToUTF16(""), shortcut);
EXPECT_EQ(ASCIIToUTF16(""), post_data);
- EXPECT_TRUE(Time() == add_date);
+ EXPECT_TRUE(base::Time() == add_date);
// Creation date.
result = Firefox2Importer::ParseBookmarkFromLine(
@@ -150,7 +148,7 @@ TEST(FirefoxImporterTest, Firefox2BookmarkParse) {
EXPECT_EQ(GURL("http://site/"), url);
EXPECT_EQ(ASCIIToUTF16(""), shortcut);
EXPECT_EQ(ASCIIToUTF16(""), post_data);
- EXPECT_TRUE(Time::FromTimeT(1121301154) == add_date);
+ EXPECT_TRUE(base::Time::FromTimeT(1121301154) == add_date);
// Post-data
result = Firefox2Importer::ParseBookmarkFromLine(
@@ -164,7 +162,7 @@ TEST(FirefoxImporterTest, Firefox2BookmarkParse) {
EXPECT_EQ("http://localhost:8080/test/hello.html", url.spec());
EXPECT_EQ(ASCIIToUTF16("post"), shortcut);
EXPECT_EQ(ASCIIToUTF16("lname%3D%25s"), post_data);
- EXPECT_TRUE(Time::FromTimeT(1212447159) == add_date);
+ EXPECT_TRUE(base::Time::FromTimeT(1212447159) == add_date);
// Invalid case.
result = Firefox2Importer::ParseBookmarkFromLine(
@@ -175,7 +173,7 @@ TEST(FirefoxImporterTest, Firefox2BookmarkParse) {
EXPECT_EQ("", url.spec());
EXPECT_EQ(ASCIIToUTF16(""), shortcut);
EXPECT_EQ(ASCIIToUTF16(""), post_data);
- EXPECT_TRUE(Time() == add_date);
+ EXPECT_TRUE(base::Time() == add_date);
// Epiphany format.
result = Firefox2Importer::ParseMinimumBookmarkFromLine(
@@ -210,7 +208,7 @@ TEST(FirefoxImporterTest, Firefox2BookmarkFileImport) {
entry = *it++;
EXPECT_EQ(ASCIIToUTF16("Empty"), entry.title);
EXPECT_TRUE(entry.is_folder);
- EXPECT_EQ(Time::FromTimeT(1295938143), entry.creation_time);
+ EXPECT_EQ(base::Time::FromTimeT(1295938143), entry.creation_time);
EXPECT_EQ(2, static_cast<int>(entry.path.size()));
if (entry.path.size() == 2) {
path_it = entry.path.begin();
@@ -221,7 +219,7 @@ TEST(FirefoxImporterTest, Firefox2BookmarkFileImport) {
entry = *it++;
EXPECT_EQ(ASCIIToUTF16("[Tamura Yukari.com]"), entry.title);
EXPECT_FALSE(entry.is_folder);
- EXPECT_EQ(Time::FromTimeT(1234567890), entry.creation_time);
+ EXPECT_EQ(base::Time::FromTimeT(1234567890), entry.creation_time);
EXPECT_EQ(2, static_cast<int>(entry.path.size()));
if (entry.path.size() == 2) {
path_it = entry.path.begin();
@@ -233,7 +231,7 @@ TEST(FirefoxImporterTest, Firefox2BookmarkFileImport) {
entry = *it++;
EXPECT_EQ(ASCIIToUTF16("Google"), entry.title);
EXPECT_FALSE(entry.is_folder);
- EXPECT_EQ(Time::FromTimeT(0000000000), entry.creation_time);
+ EXPECT_EQ(base::Time::FromTimeT(0000000000), entry.creation_time);
EXPECT_EQ(2, static_cast<int>(entry.path.size()));
if (entry.path.size() == 2) {
path_it = entry.path.begin();
@@ -255,7 +253,7 @@ TEST(FirefoxImporterTest, Firefox2BookmarkFileImport) {
entry = *it++;
EXPECT_EQ(ASCIIToUTF16("Empty"), entry.title);
EXPECT_TRUE(entry.is_folder);
- EXPECT_EQ(Time::FromTimeT(1295938143), entry.creation_time);
+ EXPECT_EQ(base::Time::FromTimeT(1295938143), entry.creation_time);
EXPECT_EQ(2, static_cast<int>(entry.path.size()));
if (entry.path.size() == 2) {
path_it = entry.path.begin();
@@ -266,7 +264,7 @@ TEST(FirefoxImporterTest, Firefox2BookmarkFileImport) {
entry = *it++;
EXPECT_EQ(ASCIIToUTF16("[Tamura Yukari.com]"), entry.title);
EXPECT_FALSE(entry.is_folder);
- EXPECT_EQ(Time::FromTimeT(1234567890), entry.creation_time);
+ EXPECT_EQ(base::Time::FromTimeT(1234567890), entry.creation_time);
EXPECT_EQ(2, static_cast<int>(entry.path.size()));
if (entry.path.size() == 2) {
path_it = entry.path.begin();
« no previous file with comments | « no previous file | chrome/browser/importer/ie_importer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698