google_apis: Inject the base WAPI server URL to GDataWapiService

chrome/browser/chromeos/drive/drive_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/drive/drive_system_service.h"
 
 #include "base/bind.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/drive/drive_api_service.h"
 #include "chrome/browser/chromeos/drive/drive_download_observer.h"
 #include "chrome/browser/chromeos/drive/drive_file_system.h"
 #include "chrome/browser/chromeos/drive/drive_file_system_proxy.h"
 #include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #include "chrome/browser/chromeos/drive/drive_prefetcher.h"
 #include "chrome/browser/chromeos/drive/drive_sync_client.h"
 #include "chrome/browser/chromeos/drive/drive_webapps_registry.h"
 #include "chrome/browser/chromeos/drive/event_logger.h"
 #include "chrome/browser/chromeos/drive/file_write_helper.h"
 #include "chrome/browser/chromeos/drive/stale_cache_files_remover.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/google_apis/drive_api_util.h"
 #include "chrome/browser/google_apis/drive_uploader.h"
 #include "chrome/browser/google_apis/gdata_wapi_service.h"
+#include "chrome/browser/google_apis/gdata_wapi_url_generator.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "google/cacheinvalidation/types.pb.h"
@@ skipping 322 matching lines @@
   g_test_cache_root = !cache_root.empty() ? new std::string(cache_root) : NULL;
 }
 
 ProfileKeyedService* DriveSystemServiceFactory::BuildServiceInstanceFor(
     Profile* profile) const {
   DriveSystemService* service = new DriveSystemService(profile);
 
   google_apis::DriveServiceInterface* drive_service = g_test_drive_service;
   g_test_drive_service = NULL;
   if (!drive_service) {
-    if (google_apis::util::IsDriveV2ApiEnabled())
+    if (google_apis::util::IsDriveV2ApiEnabled()) {
       drive_service = new DriveAPIService();
-    else
-      drive_service = new google_apis::GDataWapiService();
+    } else {
+      drive_service = new google_apis::GDataWapiService(
+          GURL(google_apis::GDataWapiUrlGenerator::kBaseUrlForProduction));
+    }
   }
 
   FilePath cache_root =
       g_test_cache_root ? FilePath(*g_test_cache_root) :
                           DriveCache::GetCacheRootPath(profile);
   delete g_test_cache_root;
   g_test_cache_root = NULL;
 
   service->Initialize(drive_service, cache_root);
   return service;
 }
 
 }  // namespace drive