Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / google_apis / drive / base_requests_unittest.cc

diff --git a/src/google_apis/drive/base_requests_unittest.cc b/src/google_apis/drive/base_requests_unittest.cc
index f3a97c1..11f887c 100644 (file)
--- a/src/google_apis/drive/base_requests_unittest.cc
+++ b/src/google_apis/drive/base_requests_unittest.cc
@@ -27,9 +27,9 @@ const char kInvalidJsonString[] = "$$$";
 
 class FakeUrlFetchRequest : public UrlFetchRequestBase {
  public:
-  explicit FakeUrlFetchRequest(RequestSender* sender,
-                               const EntryActionCallback& callback,
-                               const GURL& url)
+  FakeUrlFetchRequest(RequestSender* sender,
+                      const EntryActionCallback& callback,
+                      const GURL& url)
       : UrlFetchRequestBase(sender),
         callback_(callback),
         url_(url) {
@@ -51,24 +51,6 @@ class FakeUrlFetchRequest : public UrlFetchRequestBase {
   GURL url_;
 };
 
-class FakeGetDataRequest : public GetDataRequest {
- public:
-  explicit FakeGetDataRequest(RequestSender* sender,
-                              const GetDataCallback& callback,
-                              const GURL& url)
-      : GetDataRequest(sender, callback),
-        url_(url) {
-  }
-
-  virtual ~FakeGetDataRequest() {
-  }
-
- protected:
-  virtual GURL GetURL() const OVERRIDE { return url_; }
-
-  GURL url_;
-};
-
 }  // namespace
 
 class BaseRequestsTest : public testing::Test {
@@ -109,11 +91,7 @@ class BaseRequestsTest : public testing::Test {
 };
 
 TEST_F(BaseRequestsTest, ParseValidJson) {
-  scoped_ptr<base::Value> json;
-  ParseJson(message_loop_.message_loop_proxy(),
-            kValidJsonString,
-            base::Bind(test_util::CreateCopyResultCallback(&json)));
-  base::RunLoop().RunUntilIdle();
+  scoped_ptr<base::Value> json(ParseJson(kValidJsonString));
 
   base::DictionaryValue* root_dict = NULL;
   ASSERT_TRUE(json);
@@ -125,14 +103,7 @@ TEST_F(BaseRequestsTest, ParseValidJson) {
 }
 
 TEST_F(BaseRequestsTest, ParseInvalidJson) {
-  // Initialize with a valid pointer to verify that null is indeed assigned.
-  scoped_ptr<base::Value> json(base::Value::CreateNullValue());
-  ParseJson(message_loop_.message_loop_proxy(),
-            kInvalidJsonString,
-            base::Bind(test_util::CreateCopyResultCallback(&json)));
-  base::RunLoop().RunUntilIdle();
-
-  EXPECT_FALSE(json);
+  EXPECT_FALSE(ParseJson(kInvalidJsonString));
 }
 
 TEST_F(BaseRequestsTest, UrlFetchRequestBaseResponseCodeOverride) {
@@ -165,40 +136,4 @@ TEST_F(BaseRequestsTest, UrlFetchRequestBaseResponseCodeOverride) {
   EXPECT_EQ(HTTP_SERVICE_UNAVAILABLE, error);
 }
 
-TEST_F(BaseRequestsTest, GetDataRequestParseValidResponse) {
-  response_body_ = kValidJsonString;
-
-  GDataErrorCode error = GDATA_OTHER_ERROR;
-  scoped_ptr<base::Value> value;
-  base::RunLoop run_loop;
-  sender_->StartRequestWithRetry(
-      new FakeGetDataRequest(
-          sender_.get(),
-          test_util::CreateQuitCallback(
-              &run_loop, test_util::CreateCopyResultCallback(&error, &value)),
-          test_server_.base_url()));
-  run_loop.Run();
-
-  EXPECT_EQ(HTTP_SUCCESS, error);
-  EXPECT_TRUE(value);
-}
-
-TEST_F(BaseRequestsTest, GetDataRequestParseInvalidResponse) {
-  response_body_ = kInvalidJsonString;
-
-  GDataErrorCode error = GDATA_OTHER_ERROR;
-  scoped_ptr<base::Value> value;
-  base::RunLoop run_loop;
-  sender_->StartRequestWithRetry(
-      new FakeGetDataRequest(
-          sender_.get(),
-          test_util::CreateQuitCallback(
-              &run_loop, test_util::CreateCopyResultCallback(&error, &value)),
-          test_server_.base_url()));
-  run_loop.Run();
-
-  EXPECT_EQ(GDATA_PARSE_ERROR, error);
-  EXPECT_FALSE(value);
-}
-
 }  // namespace google_apis