Cleanup: separate WAPI and Drive API code in gdata_documents_service.

chrome/browser/chromeos/gdata/gdata_wapi_service_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
-#include "chrome/browser/chromeos/gdata/gdata_documents_service.h"
+#include "chrome/browser/chromeos/gdata/gdata_wapi_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "net/test/test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gdata {
 
 namespace {
 
 class GDataTest : public InProcessBrowserTest {
  public:
   GDataTest()
       : InProcessBrowserTest(),
         gdata_test_server_(net::TestServer::TYPE_GDATA,
                            net::TestServer::kLocalhost,
                            FilePath(FILE_PATH_LITERAL("chrome/test/data"))) {
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     ASSERT_TRUE(gdata_test_server_.Start());
-    service_.reset(new gdata::DocumentsService);
+    service_.reset(new gdata::GDataWapiService);
     service_->Initialize(browser()->profile());
     service_->auth_service_for_testing()->set_access_token_for_testing(
         net::TestServer::kGDataAuthToken);
   }
 
   virtual void CleanUpOnMainThread() {
     service_.reset();
   }
 
  protected:
   FilePath GetTestCachedFilePath(const FilePath& file_name) {
     return browser()->profile()->GetPath().Append(file_name);
   }
 
   net::TestServer gdata_test_server_;
-  scoped_ptr<gdata::DocumentsService> service_;
+  scoped_ptr<gdata::GDataWapiService> service_;
 };
 
-// The test callback for DocumentsService::DownloadFile().
+// The test callback for GDataWapiService::DownloadFile().
 void TestDownloadCallback(gdata::GDataErrorCode* result,
                           std::string* contents,
                           gdata::GDataErrorCode error,
                           const GURL& content_url,
                           const FilePath& temp_file) {
   *result = error;
   file_util::ReadFileToString(temp_file, contents);
   file_util::Delete(temp_file, false);
   MessageLoop::current()->Quit();
 }
 
-// The test callback for DocumentsService::GetDocuments().
+// The test callback for GDataWapiService::GetDocuments().
 void TestGetDocumentsCallback(gdata::GDataErrorCode* result_code,
                               base::Value** result_data,
                               gdata::GDataErrorCode error,
                               scoped_ptr<base::Value> feed_data) {
   *result_code = error;
   *result_data = feed_data.release();
   MessageLoop::current()->Quit();
 }
 
 }  // namespace
@@ skipping 66 matching lines @@
       std::string(),  // search string
       std::string(),  // directory resource ID
       base::Bind(&TestGetDocumentsCallback, &result, &result_data));
   content::RunMessageLoop();
 
   EXPECT_EQ(gdata::GDATA_PARSE_ERROR, result);
   EXPECT_FALSE(result_data);
 }
 
 }  // namespace gdata