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

Unified Diff: chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc

Issue 304533003: [fsp] Rename has_next to has_more. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
Index: chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc
diff --git a/chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc b/chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc
index da2941d8e89458ce35fe29ee57b492697930bf86..2a727edcaf594fd8f6ca80fa5fcfe2794aa688be 100644
--- a/chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc
@@ -37,20 +37,20 @@ class EventLogger {
class SuccessEvent {
public:
- SuccessEvent(int request_id, scoped_ptr<RequestValue> result, bool has_next)
+ SuccessEvent(int request_id, scoped_ptr<RequestValue> result, bool has_more)
: request_id_(request_id),
result_(result.Pass()),
- has_next_(has_next) {}
+ has_more_(has_more) {}
virtual ~SuccessEvent() {}
int request_id() { return request_id_; }
RequestValue* result() { return result_.get(); }
- bool has_next() { return has_next_; }
+ bool has_more() { return has_more_; }
private:
int request_id_;
scoped_ptr<RequestValue> result_;
- bool has_next_;
+ bool has_more_;
};
class ErrorEvent {
@@ -76,9 +76,9 @@ class EventLogger {
void OnSuccess(int request_id,
scoped_ptr<RequestValue> result,
- bool has_next) {
+ bool has_more) {
success_events_.push_back(
- new SuccessEvent(request_id, result.Pass(), has_next));
+ new SuccessEvent(request_id, result.Pass(), has_more));
}
void OnError(int request_id, base::File::Error error) {
@@ -122,9 +122,9 @@ class FakeHandler : public RequestManager::HandlerInterface {
// RequestManager::Handler overrides.
virtual void OnSuccess(int request_id,
scoped_ptr<RequestValue> result,
- bool has_next) OVERRIDE {
+ bool has_more) OVERRIDE {
if (logger_.get())
- logger_->OnSuccess(request_id, result.Pass(), has_next);
+ logger_->OnSuccess(request_id, result.Pass(), has_more);
}
// RequestManager::Handler overrides.
@@ -169,10 +169,10 @@ TEST_F(FileSystemProviderRequestManagerTest, CreateAndFulFill) {
scoped_ptr<RequestValue> response(
RequestValue::CreateForTesting("i-like-vanilla"));
- const bool has_next = false;
+ const bool has_more = false;
bool result =
- request_manager_->FulfillRequest(request_id, response.Pass(), has_next);
+ request_manager_->FulfillRequest(request_id, response.Pass(), has_more);
EXPECT_TRUE(result);
// Validate if the callback has correct arguments.
@@ -183,14 +183,14 @@ TEST_F(FileSystemProviderRequestManagerTest, CreateAndFulFill) {
const std::string* response_test_string = event->result()->testing_params();
ASSERT_TRUE(response_test_string);
EXPECT_EQ("i-like-vanilla", *response_test_string);
- EXPECT_FALSE(event->has_next());
+ EXPECT_FALSE(event->has_more());
// Confirm, that the request is removed. Basically, fulfilling again for the
// same request, should fail.
{
scoped_ptr<RequestValue> response;
bool retry =
- request_manager_->FulfillRequest(request_id, response.Pass(), has_next);
+ request_manager_->FulfillRequest(request_id, response.Pass(), has_more);
EXPECT_FALSE(retry);
}
@@ -214,10 +214,10 @@ TEST_F(FileSystemProviderRequestManagerTest, CreateAndFulFill_WithHasNext) {
EXPECT_EQ(0u, logger.error_events().size());
scoped_ptr<RequestValue> response;
- const bool has_next = true;
+ const bool has_more = true;
bool result =
- request_manager_->FulfillRequest(request_id, response.Pass(), has_next);
+ request_manager_->FulfillRequest(request_id, response.Pass(), has_more);
EXPECT_TRUE(result);
// Validate if the callback has correct arguments.
@@ -225,23 +225,23 @@ TEST_F(FileSystemProviderRequestManagerTest, CreateAndFulFill_WithHasNext) {
EXPECT_EQ(0u, logger.error_events().size());
EventLogger::SuccessEvent* event = logger.success_events()[0];
EXPECT_FALSE(event->result());
- EXPECT_TRUE(event->has_next());
+ EXPECT_TRUE(event->has_more());
- // Confirm, that the request is not removed (since it has has_next == true).
+ // Confirm, that the request is not removed (since it has has_more == true).
// Basically, fulfilling again for the same request, should not fail.
{
- bool new_has_next = false;
+ bool new_has_more = false;
bool retry = request_manager_->FulfillRequest(
- request_id, response.Pass(), new_has_next);
+ request_id, response.Pass(), new_has_more);
EXPECT_TRUE(retry);
}
- // Since |new_has_next| is false, then the request should be removed. To check
+ // Since |new_has_more| is false, then the request should be removed. To check
// it, try to fulfill again, what should fail.
{
- bool new_has_next = false;
+ bool new_has_more = false;
bool retry = request_manager_->FulfillRequest(
- request_id, response.Pass(), new_has_next);
+ request_id, response.Pass(), new_has_more);
EXPECT_FALSE(retry);
}
}
@@ -271,9 +271,9 @@ TEST_F(FileSystemProviderRequestManagerTest, CreateAndReject) {
// same request, should fail.
{
scoped_ptr<RequestValue> response;
- bool has_next = false;
+ bool has_more = false;
bool retry =
- request_manager_->FulfillRequest(request_id, response.Pass(), has_next);
+ request_manager_->FulfillRequest(request_id, response.Pass(), has_more);
EXPECT_FALSE(retry);
}

Powered by Google App Engine
This is Rietveld 408576698