google_apis: Get rid of gdata_wapi_url_util namespace

chrome/browser/google_apis/gdata_wapi_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_SERVICE_H_
 #define CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_SERVICE_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/google_apis/auth_service_observer.h"
 #include "chrome/browser/google_apis/drive_service_interface.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"
 
 class FilePath;
 class GURL;
 class Profile;
 
 namespace google_apis {
 class AuthService;
 class OperationRunner;
 
 // This class provides documents feed service calls for WAPI (codename for
@@ skipping 95 matching lines @@
   // Operation objects should hold a copy of this, rather than a const
   // reference, as they may outlive this object.
   GDataWapiUrlGenerator url_generator_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataWapiService);
 };
 
 }  // namespace google_apis
 
 #endif  // CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_SERVICE_H_