Cleanup: separate WAPI and Drive API code in gdata_documents_service.

chrome/browser/chromeos/gdata/gdata_system_service.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 "chrome/browser/chromeos/gdata/gdata_system_service.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/gdata/drive_api_service.h"
 #include "chrome/browser/chromeos/gdata/drive_webapps_registry.h"
 #include "chrome/browser/chromeos/gdata/file_write_helper.h"
 #include "chrome/browser/chromeos/gdata/gdata_contacts_service.h"
-#include "chrome/browser/chromeos/gdata/gdata_documents_service.h"
 #include "chrome/browser/chromeos/gdata/gdata_download_observer.h"
 #include "chrome/browser/chromeos/gdata/gdata_file_system.h"
 #include "chrome/browser/chromeos/gdata/gdata_file_system_proxy.h"
 #include "chrome/browser/chromeos/gdata/gdata_sync_client.h"
 #include "chrome/browser/chromeos/gdata/gdata_uploader.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
+#include "chrome/browser/chromeos/gdata/gdata_wapi_service.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
 
 using content::BrowserContext;
@@ skipping 172 matching lines @@
     const std::string& cache_root) {
   if (g_test_cache_root)
     delete g_test_cache_root;
   g_test_cache_root = !cache_root.empty() ? new std::string(cache_root) : NULL;
 }
 
 ProfileKeyedService* GDataSystemServiceFactory::BuildServiceInstanceFor(
     Profile* profile) const {
   GDataSystemService* service = new GDataSystemService(profile);
 
-  DocumentsServiceInterface* documents_service =
-      g_test_documents_service ? g_test_documents_service :
-                                 new DocumentsService();
+  DocumentsServiceInterface* documents_service = g_test_documents_service;
   g_test_documents_service = NULL;
+  if (!documents_service) {
+    documents_service = util::IsDriveV2ApiEnabled() ?
+                        reinterpret_cast<DocumentsServiceInterface*>(

[satorux1, 2012/08/20 16:52:30]

I guess the reinterpret_cast is unnecessary.

[satorux1, 2012/08/20 17:01:29]

Maybe reinterpret_cast is needed because of the ternary operator. If so, please
make it if-else.

[kochi, 2012/08/21 01:42:45]

Yes, it was necessary for ternary operator.
Changed to use if-else here to remove these casts.

+                            new DriveAPIService()) :
+                        reinterpret_cast<DocumentsServiceInterface*>(
+                            new GDataWapiService());
+  }
 
   FilePath cache_root =
       g_test_cache_root ? FilePath(*g_test_cache_root) :
                           GDataCache::GetCacheRootPath(profile);
   delete g_test_cache_root;
   g_test_cache_root = NULL;
 
   service->Initialize(documents_service, cache_root);
   return service;
 }
 
 }  // namespace gdata