google_apis: Get rid of gdata_wapi_url_util namespace

chrome/browser/google_apis/gdata_wapi_service.cc

Index: chrome/browser/google_apis/gdata_wapi_service.cc
diff --git a/chrome/browser/google_apis/gdata_wapi_service.cc b/chrome/browser/google_apis/gdata_wapi_service.cc
index c555753adb2f6a011be5b065f718f12a4b952436..8f6b22b4780d4d29faef82912f1982807637b5c6 100644
--- a/chrome/browser/google_apis/gdata_wapi_service.cc
+++ b/chrome/browser/google_apis/gdata_wapi_service.cc
@@ -11,7 +11,7 @@
 #include "base/message_loop_proxy.h"
 #include "chrome/browser/google_apis/auth_service.h"
 #include "chrome/browser/google_apis/gdata_wapi_operations.h"
-#include "chrome/browser/google_apis/gdata_wapi_url_util.h"
+#include "chrome/browser/google_apis/gdata_wapi_url_generator.h"
 #include "chrome/browser/google_apis/operation_runner.h"
 #include "chrome/browser/google_apis/time_util.h"
 #include "chrome/common/net/url_util.h"
@@ -69,7 +69,7 @@ const char kDriveAppsScope[] = "https://www.googleapis.com/auth/drive.apps";
 GDataWapiService::GDataWapiService()
     : runner_(NULL),
       // TODO(satorux): The base URL should be injected.
-      url_generator_(GURL(gdata_wapi_url_util::kBaseUrlForProduction)) {
+      url_generator_(GURL(GDataWapiUrlGenerator::kBaseUrlForProduction)) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }