diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-21 23:07:15 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-21 23:07:15 +0000 |
| commit | a33457b842b5b8e70622d7c73f266bb94dec6a49 (patch) | |
| tree | 6861fd3d684ea96588adfd2c9df03787344e85d0 /chrome/browser/tab_contents | |
| parent | 66547160c1f2646c9d3f1ec363d41ae56e62f29f (diff) | |
| download | chromium_src-a33457b842b5b8e70622d7c73f266bb94dec6a49.zip chromium_src-a33457b842b5b8e70622d7c73f266bb94dec6a49.tar.gz chromium_src-a33457b842b5b8e70622d7c73f266bb94dec6a49.tar.bz2 | |
Mock the LinkDoctor for tests. Should greatly decrease ErrorPage test flakiness.
Not getting rid of WaitForTitleMatching because I have to add few more calls to the automation framework (http://crbug.com/19395) to wait properly after navigating back and forward.
TEST=Covered by ui_tests and browser_tests.
http://crbug.com/18365, http://crbug.com/19361
Review URL: http://codereview.chromium.org/174179
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26761 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 1568790..e80deda 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -136,9 +136,6 @@ const float kMaxHeightFactor = 0.6; // contents. const int kJavascriptMessageExpectedDelay = 1000; -const char kLinkDoctorBaseURL[] = - "http://linkhelp.clients.google.com/tbproxy/lh/fixurl"; - // The list of prefs we want to observe. const wchar_t* kPrefsToObserve[] = { prefs::kAlternateErrorPagesEnabled, @@ -2323,7 +2320,8 @@ GURL TabContents::GetAlternateErrorPageURL() const { PrefService* prefs = profile()->GetPrefs(); DCHECK(prefs); if (prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled)) { - url = google_util::AppendGoogleLocaleParam(GURL(kLinkDoctorBaseURL)); + url = google_util::AppendGoogleLocaleParam( + GURL(google_util::kLinkDoctorBaseURL)); url = google_util::AppendGoogleTLDParam(url); } return url; |