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

Unified Diff: net/base/directory_lister_unittest.cc

Issue 5710002: Create base::WorkerPoolJob. Use it for HostResolverImpl and DirectoryLister. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments. Created 10 years 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
Index: net/base/directory_lister_unittest.cc
diff --git a/net/base/directory_lister_unittest.cc b/net/base/directory_lister_unittest.cc
index 5607bc5fea2822244d4e5dcc070f1e6e987d8042..d7cc24bc74ebfe28784edeff93d67d0be1ff0be7 100644
--- a/net/base/directory_lister_unittest.cc
+++ b/net/base/directory_lister_unittest.cc
@@ -12,15 +12,15 @@
#include "net/base/net_errors.h"
#include "testing/gtest/include/gtest/gtest.h"
+namespace net {
+
namespace {
-class DirectoryListerTest : public testing::Test {};
-}
-class ListerDelegate : public net::DirectoryLister::DirectoryListerDelegate {
+class ListerDelegate : public DirectoryLister::Delegate {
public:
explicit ListerDelegate(bool recursive) : error_(-1), recursive_(recursive) {
}
- void OnListFile(const net::DirectoryLister::DirectoryListerData& data) {
+ void OnListFile(const DirectoryLister::Data& data) {
file_list_.push_back(data.info);
paths_.push_back(data.path);
}
@@ -77,14 +77,13 @@ TEST(DirectoryListerTest, BigDirTest) {
ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &path));
ListerDelegate delegate(false);
- scoped_refptr<net::DirectoryLister> lister(
- new net::DirectoryLister(path, &delegate));
+ DirectoryLister lister(path, &delegate);
- lister->Start();
+ lister.Start();
MessageLoop::current()->Run();
- EXPECT_EQ(delegate.error(), net::OK);
+ EXPECT_EQ(OK, delegate.error());
}
TEST(DirectoryListerTest, BigDirRecursiveTest) {
@@ -92,17 +91,13 @@ TEST(DirectoryListerTest, BigDirRecursiveTest) {
ASSERT_TRUE(PathService::Get(base::DIR_EXE, &path));
ListerDelegate delegate(true);
- scoped_refptr<net::DirectoryLister> lister(
- new net::DirectoryLister(path,
- true,
- net::DirectoryLister::FULL_PATH,
- &delegate));
+ DirectoryLister lister(path, true, DirectoryLister::FULL_PATH, &delegate);
- lister->Start();
+ lister.Start();
MessageLoop::current()->Run();
- EXPECT_EQ(delegate.error(), net::OK);
+ EXPECT_EQ(OK, delegate.error());
}
TEST(DirectoryListerTest, CancelTest) {
@@ -110,13 +105,13 @@ TEST(DirectoryListerTest, CancelTest) {
ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &path));
ListerDelegate delegate(false);
- scoped_refptr<net::DirectoryLister> lister(
- new net::DirectoryLister(path, &delegate));
+ DirectoryLister lister(path, &delegate);
- lister->Start();
- lister->Cancel();
+ lister.Start();
+ lister.Cancel();
+ MessageLoop::current()->RunAllPending();
+}
- MessageLoop::current()->Run();
+} // namespace
- EXPECT_EQ(delegate.error(), net::ERR_ABORTED);
-}
+} // namespace net

Powered by Google App Engine
This is Rietveld 408576698