Misc cleanups in Drive code.

chrome/browser/google_apis/test_util.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_TEST_UTIL_H_
 #define CHROME_BROWSER_GOOGLE_APIS_TEST_UTIL_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
-#include "googleurl/src/gurl.h"
+
+class GURL;
 
 namespace base {
 class FilePath;
 class Value;
 }
 
 namespace google_apis {
 
 class AppList;
 class AccountMetadataFeed;
@@ skipping 127 matching lines @@
 // Returns true if |json_data| is not NULL and equals to the content in
 // |expected_json_file_path|. The failure reason will be logged into LOG(ERROR)
 // if necessary.
 bool VerifyJsonData(const base::FilePath& expected_json_file_path,
                     const base::Value* json_data);
 
 }  // namespace test_util
 }  // namespace google_apis
 
 #endif  // CHROME_BROWSER_GOOGLE_APIS_TEST_UTIL_H_