Try to cut down on some unnecessary dependencies. Remove any unused includes of gurl.h in header files, and forward declare GURL where possible.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33 0039d316-1c4b-4281-b951-d872f2087c98

30 files changed, 37 insertions, 22 deletions

diff --git a/chrome/browser/automation/url_request_failed_dns_job.cc b/chrome/browser/automation/url_request_failed_dns_job.cc
index 1272b6d..1a2ce49a 100644
--- a/chrome/browser/automation/url_request_failed_dns_job.cc
+++ b/chrome/browser/automation/url_request_failed_dns_job.cc
@@ -30,6 +30,7 @@
 #include "chrome/browser/automation/url_request_failed_dns_job.h"
 
 #include "base/message_loop.h"
+#include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_filter.h"
diff --git a/chrome/browser/automation/url_request_failed_dns_job.h b/chrome/browser/automation/url_request_failed_dns_job.h
index 1020ae3..5b3d590 100644
--- a/chrome/browser/automation/url_request_failed_dns_job.h
+++ b/chrome/browser/automation/url_request_failed_dns_job.h
@@ -31,7 +31,6 @@
 #ifndef CHROME_BROWSER_AUTOMATION_URL_REQUEST_FAILED_DNS_JOB_H__
 #define CHROME_BROWSER_AUTOMATION_URL_REQUEST_FAILED_DNS_JOB_H__
 
-#include "googleurl/src/gurl.h"
 #include "net/url_request/url_request_job.h"
 
 class URLRequestFailedDnsJob : public URLRequestJob {
diff --git a/chrome/browser/automation/url_request_slow_download_job.cc b/chrome/browser/automation/url_request_slow_download_job.cc
index cac0cab..8d48c06 100644
--- a/chrome/browser/automation/url_request_slow_download_job.cc
+++ b/chrome/browser/automation/url_request_slow_download_job.cc
@@ -31,6 +31,7 @@
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
+#include "googleurl/src/gurl.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_filter.h"
 
diff --git a/chrome/browser/automation/url_request_slow_download_job.h b/chrome/browser/automation/url_request_slow_download_job.h
index d05f850..ca866b4 100644
--- a/chrome/browser/automation/url_request_slow_download_job.h
+++ b/chrome/browser/automation/url_request_slow_download_job.h
@@ -35,7 +35,6 @@
 
 #include <vector>
 
-#include "googleurl/src/gurl.h"
 #include "net/url_request/url_request_job.h"
 
 class URLRequestSlowDownloadJob : public URLRequestJob {
diff --git a/chrome/browser/download_file.cc b/chrome/browser/download_file.cc
index c2ad716..5f8ab12 100644
--- a/chrome/browser/download_file.cc
+++ b/chrome/browser/download_file.cc
@@ -48,6 +48,7 @@
 #include "chrome/common/stl_util-inl.h"
 #include "chrome/common/win_util.h"
 #include "chrome/common/win_safe_util.h"
+#include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_context.h"
 
diff --git a/chrome/browser/download_file.h b/chrome/browser/download_file.h
index 0ae9e17..53be7c2 100644
--- a/chrome/browser/download_file.h
+++ b/chrome/browser/download_file.h
@@ -76,9 +76,9 @@
 #include "base/ref_counted.h"
 #include "base/thread.h"
 #include "chrome/browser/history/download_types.h"
-#include "googleurl/src/gurl.h"
 
 class DownloadManager;
+class GURL;
 class MessageLoop;
 class ResourceDispatcherHost;
 class Task;
diff --git a/chrome/browser/download_manager.cc b/chrome/browser/download_manager.cc
index a0a5b1b..06759c9 100644
--- a/chrome/browser/download_manager.cc
+++ b/chrome/browser/download_manager.cc
@@ -58,6 +58,7 @@
 #include "chrome/common/pref_service.h"
 #include "chrome/common/stl_util-inl.h"
 #include "chrome/common/win_util.h"
+#include "googleurl/src/gurl.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_context.h"
diff --git a/chrome/browser/download_manager.h b/chrome/browser/download_manager.h
index b7ee544..eee6016 100644
--- a/chrome/browser/download_manager.h
+++ b/chrome/browser/download_manager.h
@@ -74,12 +74,12 @@
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/common/pref_member.h"
-#include "googleurl/src/gurl.h"
 
 class DownloadFileManager;
 class DownloadItem;
 class DownloadItemView;
 class DownloadManager;
+class GURL;
 class MessageLoop;
 class PrefService;
 class Profile;
diff --git a/chrome/browser/external_protocol_handler.cc b/chrome/browser/external_protocol_handler.cc
index 9d40823..a3fc326 100644
--- a/chrome/browser/external_protocol_handler.cc
+++ b/chrome/browser/external_protocol_handler.cc
@@ -42,6 +42,7 @@
 #include "chrome/browser/external_protocol_dialog.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/pref_names.h"
+#include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 
 // static
diff --git a/chrome/browser/external_protocol_handler.h b/chrome/browser/external_protocol_handler.h
index b595c28..d37da4a 100644
--- a/chrome/browser/external_protocol_handler.h
+++ b/chrome/browser/external_protocol_handler.h
@@ -27,12 +27,12 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "chrome/common/pref_service.h"
-#include "googleurl/src/gurl.h"
-
 #ifndef CHROME_BROWSER_EXTERNAL_PROTOCOL_HANDLER_H__
 #define CHROME_BROWSER_EXTERNAL_PROTOCOL_HANDLER_H__
 
+#include "chrome/common/pref_service.h"
+
+class GURL;
 class MessageLoop;
 
 class ExternalProtocolHandler {
@@ -75,4 +75,4 @@ class ExternalProtocolHandler {
   static void PrepopulateDictionary(DictionaryValue* win_pref);
 };
 
-#endif CHROME_BROWSER_EXTERNAL_PROTOCOL_HANDLER_H__
+#endif  // CHROME_BROWSER_EXTERNAL_PROTOCOL_HANDLER_H__
diff --git a/chrome/browser/firefox_importer_utils.cc b/chrome/browser/firefox_importer_utils.cc
index 26fb2425..35425da 100644
--- a/chrome/browser/firefox_importer_utils.cc
+++ b/chrome/browser/firefox_importer_utils.cc
@@ -40,6 +40,7 @@
 #include "chrome/browser/template_url_model.h"
 #include "chrome/browser/template_url_parser.h"
 #include "chrome/common/win_util.h"
+#include "googleurl/src/gurl.h"
 #include "net/base/base64.h"
 
 namespace {
diff --git a/chrome/browser/firefox_importer_utils.h b/chrome/browser/firefox_importer_utils.h
index df9e4ce0..7f00495 100644
--- a/chrome/browser/firefox_importer_utils.h
+++ b/chrome/browser/firefox_importer_utils.h
@@ -31,9 +31,9 @@
 #define CHROME_BROWSER_FIREFOX_IMPORTER_UTILS_H_
 
 #include "base/values.h"
-#include "googleurl/src/gurl.h"
 #include "webkit/glue/password_form.h"
 
+class GURL;
 class TemplateURL;
 
 // Detects which version of Firefox is installed. Returns its
diff --git a/chrome/browser/google_util.cc b/chrome/browser/google_util.cc
index 9f8f8d7..d3d74f7 100644
--- a/chrome/browser/google_util.cc
+++ b/chrome/browser/google_util.cc
@@ -34,6 +34,7 @@
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google_url_tracker.h"
+#include "googleurl/src/gurl.h"
 #include "net/base/registry_controlled_domain.h"
 
 namespace {
diff --git a/chrome/browser/google_util.h b/chrome/browser/google_util.h
index cc24f6e..5098b09 100644
--- a/chrome/browser/google_util.h
+++ b/chrome/browser/google_util.h
@@ -32,7 +32,7 @@
 #ifndef CHROME_BROWSER_GOOGLE_UTIL_H__
 #define CHROME_BROWSER_GOOGLE_UTIL_H__
 
-#include "googleurl/src/gurl.h"
+class GURL;
 
 namespace google_util {
 
diff --git a/chrome/browser/history/history_database.h b/chrome/browser/history/history_database.h
index 852fef5..bb62db9 100644
--- a/chrome/browser/history/history_database.h
+++ b/chrome/browser/history/history_database.h
@@ -40,7 +40,6 @@
 #include "chrome/browser/meta_table_helper.h"
 #include "chrome/common/sqlite_compiled_statement.h"
 #include "chrome/common/sqlite_utils.h"
-#include "googleurl/src/gurl.h"
 
 struct sqlite3;
 
diff --git a/chrome/browser/metrics_log.cc b/chrome/browser/metrics_log.cc
index 5509c1c..e488567 100644
--- a/chrome/browser/metrics_log.cc
+++ b/chrome/browser/metrics_log.cc
@@ -40,6 +40,7 @@
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
+#include "googleurl/src/gurl.h"
 #include "net/base/base64.h"
 
 #define OPEN_ELEMENT_FOR_SCOPE(name) ScopedElement scoped_element(this, name)
diff --git a/chrome/browser/metrics_log.h b/chrome/browser/metrics_log.h
index 69eb70c..66796a7 100644
--- a/chrome/browser/metrics_log.h
+++ b/chrome/browser/metrics_log.h
@@ -42,11 +42,11 @@
 #include "base/histogram.h"
 #include "base/time.h"
 #include "chrome/common/page_transition_types.h"
-#include "googleurl/src/gurl.h"
 #include "webkit/glue/webplugin.h"
 
 struct AutocompleteLog;
 class DictionaryValue;
+class GURL;
 class PrefService;
 
 class MetricsLog {
diff --git a/chrome/browser/printing/print_job_worker.h b/chrome/browser/printing/print_job_worker.h
index c7064f7..2cd75c4 100644
--- a/chrome/browser/printing/print_job_worker.h
+++ b/chrome/browser/printing/print_job_worker.h
@@ -34,7 +34,6 @@
 #include "base/thread.h"
 #include "chrome/browser/printing/page_number.h"
 #include "chrome/browser/printing/win_printing_context.h"
-#include "googleurl/src/gurl.h"
 
 namespace printing {
 
diff --git a/chrome/browser/renderer_security_policy.cc b/chrome/browser/renderer_security_policy.cc
index 2fba7de..dcffa38 100644
--- a/chrome/browser/renderer_security_policy.cc
+++ b/chrome/browser/renderer_security_policy.cc
@@ -31,6 +31,7 @@
 
 #include "base/logging.h"
 #include "base/string_util.h"
+#include "googleurl/src/gurl.h"
 #include "net/url_request/url_request.h"
 
 // The SecurityState class is used to maintain per-renderer security state
diff --git a/chrome/browser/renderer_security_policy.h b/chrome/browser/renderer_security_policy.h
index c71d45d1..f91af9e 100644
--- a/chrome/browser/renderer_security_policy.h
+++ b/chrome/browser/renderer_security_policy.h
@@ -37,7 +37,8 @@
 #include "base/basictypes.h"
 #include "base/lock.h"
 #include "base/singleton.h"
-#include "googleurl/src/gurl.h"
+
+class GURL;
 
 // The RendererSecurityPolicy class is used to grant and revoke security
 // capabilities for renderers.  For example, it restricts whether a renderer
@@ -142,4 +143,4 @@ class RendererSecurityPolicy {
   DISALLOW_EVIL_CONSTRUCTORS(RendererSecurityPolicy);
 };
 
-#endif // CHROME_BROWSER_RENDERER_SECURITY_POLICY_H__
\ No newline at end of file
+#endif  // CHROME_BROWSER_RENDERER_SECURITY_POLICY_H__
diff --git a/chrome/browser/safe_browsing/safe_browsing_database.cc b/chrome/browser/safe_browsing/safe_browsing_database.cc
index 9e7c223..1def4a3 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database.cc
@@ -38,6 +38,7 @@
 #include "chrome/browser/safe_browsing/chunk_range.h"
 #include "chrome/common/sqlite_compiled_statement.h"
 #include "chrome/common/sqlite_utils.h"
+#include "googleurl/src/gurl.h"
 
 // Database version.  If this is different than what's stored on disk, the
 // database is reset.
diff --git a/chrome/browser/safe_browsing/safe_browsing_database.h b/chrome/browser/safe_browsing/safe_browsing_database.h
index 0dbe5a9..3f46724 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database.h
+++ b/chrome/browser/safe_browsing/safe_browsing_database.h
@@ -41,9 +41,9 @@
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
 #include "chrome/common/sqlite_compiled_statement.h"
 #include "chrome/common/sqlite_utils.h"
-#include "googleurl/src/gurl.h"
 
 class BloomFilter;
+class GURL;
 
 // Encapsulates the database that stores information about phishing and malware
 // sites.  There is one on-disk database for all profiles, as it doesn't
@@ -319,4 +319,4 @@ class SafeBrowsingDatabase {
   DISALLOW_EVIL_CONSTRUCTORS(SafeBrowsingDatabase);
 };
 
-#endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_H__
\ No newline at end of file
+#endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_H__
diff --git a/chrome/browser/safe_browsing/safe_browsing_util.cc b/chrome/browser/safe_browsing/safe_browsing_util.cc
index 53339a1e..802d5ff 100644
--- a/chrome/browser/safe_browsing/safe_browsing_util.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_util.cc
@@ -34,6 +34,7 @@
 #include "base/sha2.h"
 #include "base/string_util.h"
 #include "chrome/browser/google_util.h"
+#include "googleurl/src/gurl.h"
 #include "net/base/base64.h"
 #include "net/base/escape.h"
 #include "unicode/locid.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_util.h b/chrome/browser/safe_browsing/safe_browsing_util.h
index b1b8151..1d98805 100644
--- a/chrome/browser/safe_browsing/safe_browsing_util.h
+++ b/chrome/browser/safe_browsing/safe_browsing_util.h
@@ -38,7 +38,8 @@
 
 #include "base/scoped_ptr.h"
 #include "chrome/browser/safe_browsing/chunk_range.h"
-#include "googleurl/src/gurl.h"
+
+class GURL;
 
 //#define SB_LOGGING_ENABLED
 #ifdef SB_LOGGING_ENABLED
diff --git a/chrome/browser/save_file_manager.cc b/chrome/browser/save_file_manager.cc
index 364d61e..886dd07 100644
--- a/chrome/browser/save_file_manager.cc
+++ b/chrome/browser/save_file_manager.cc
@@ -48,6 +48,7 @@
 #include "chrome/common/stl_util-inl.h"
 #include "chrome/common/win_util.h"
 #include "chrome/common/win_safe_util.h"
+#include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_context.h"
 
diff --git a/chrome/browser/save_file_manager.h b/chrome/browser/save_file_manager.h
index 2c79006..9c9235c 100644
--- a/chrome/browser/save_file_manager.h
+++ b/chrome/browser/save_file_manager.h
@@ -91,8 +91,8 @@
 #include "base/ref_counted.h"
 #include "base/thread.h"
 #include "chrome/browser/save_types.h"
-#include "googleurl/src/gurl.h"
 
+class GURL;
 class SaveFile;
 class SavePackage;
 class MessageLoop;
diff --git a/chrome/browser/ssl_error_info.cc b/chrome/browser/ssl_error_info.cc
index 2ee5547..fc6019c 100644
--- a/chrome/browser/ssl_error_info.cc
+++ b/chrome/browser/ssl_error_info.cc
@@ -37,6 +37,8 @@
 #include "net/base/cert_status_flags.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_info.h"
+#include "googleurl/src/gurl.h"
+
 #include "generated_resources.h"
 
 SSLErrorInfo::SSLErrorInfo(const std::wstring& title,
diff --git a/chrome/browser/ssl_error_info.h b/chrome/browser/ssl_error_info.h
index caa2b25..5739a7b 100644
--- a/chrome/browser/ssl_error_info.h
+++ b/chrome/browser/ssl_error_info.h
@@ -34,9 +34,10 @@
 #include <vector>
 
 #include "base/logging.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/x509_certificate.h"
 
+class GURL;
+
 // This class describes an error that happened while showing a page over SSL.
 // An SSLErrorInfo object only exists on the UI thread and only contains
 // information about an error (type of error and text details).
@@ -103,4 +104,4 @@ private:
   std::vector<std::wstring> extra_information_;
 };
 
-#endif  // CHROME_BROWSER_SSL_ERROR_INFO_H__
\ No newline at end of file
+#endif  // CHROME_BROWSER_SSL_ERROR_INFO_H__
diff --git a/chrome/browser/views/status_bubble.cc b/chrome/browser/views/status_bubble.cc
index 96398fa..69985cd 100644
--- a/chrome/browser/views/status_bubble.cc
+++ b/chrome/browser/views/status_bubble.cc
@@ -42,6 +42,7 @@
 #include "chrome/views/hwnd_view_container.h"
 #include "chrome/views/label.h"
 #include "chrome/views/view_container.h"
+#include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "SkPaint.h"
 #include "SkPath.h"
diff --git a/chrome/browser/views/status_bubble.h b/chrome/browser/views/status_bubble.h
index ee9edc6..d2cf442 100644
--- a/chrome/browser/views/status_bubble.h
+++ b/chrome/browser/views/status_bubble.h
@@ -33,7 +33,8 @@
 #include "base/gfx/rect.h"
 #include "chrome/views/hwnd_view_container.h"
 #include "chrome/views/view_container.h"
-#include "googleurl/src/gurl.h"
+
+class GURL;
 
 // StatusBubble displays a bubble of text that fades in, hovers over the
 // browser chrome and fades away when not needed. It is primarily designed