Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / drive / drive_url_request_job_unittest.cc

diff --git a/src/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc b/src/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc
index 0eb383a..aaa3e30 100644 (file)
--- a/src/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc
+++ b/src/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc
@@ -16,6 +16,7 @@
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
 #include "chrome/browser/drive/fake_drive_service.h"
+#include "chrome/browser/drive/test_util.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
@@ -106,10 +107,7 @@ class DriveURLRequestJobTest : public testing::Test {
   virtual void SetUp() OVERRIDE {
     // Initialize FakeDriveService.
     fake_drive_service_.reset(new FakeDriveService);
-    ASSERT_TRUE(fake_drive_service_->LoadResourceListForWapi(
-        "gdata/root_feed.json"));
-    ASSERT_TRUE(fake_drive_service_->LoadAccountMetadataForWapi(
-        "gdata/account_metadata.json"));
+    ASSERT_TRUE(test_util::SetUpTestEntries(fake_drive_service_.get()));
 
     // Initialize FakeFileSystem.
     fake_file_system_.reset(
@@ -263,8 +261,7 @@ TEST_F(DriveURLRequestJobTest, HostedDocument) {
   EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
   // Make sure that a hosted document triggers redirection.
   EXPECT_TRUE(request.is_redirecting());
-  EXPECT_EQ(GURL("https://3_document_alternate_link"),
-            test_delegate_->redirect_url());
+  EXPECT_TRUE(test_delegate_->redirect_url().is_valid());
 }
 
 TEST_F(DriveURLRequestJobTest, RootDirectory) {