summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-20 23:36:46 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-20 23:36:46 +0000
commitffc90a1e716e6bbc54eb719862a1fd7932d53510 (patch)
tree3c1673e39b2b8d52aa682a361ef8346ffd0f1144 /chrome/browser/tab_contents
parenta173cc9be851b100258d23771ecbee00cc9f44e1 (diff)
downloadchromium_src-ffc90a1e716e6bbc54eb719862a1fd7932d53510.zip
chromium_src-ffc90a1e716e6bbc54eb719862a1fd7932d53510.tar.gz
chromium_src-ffc90a1e716e6bbc54eb719862a1fd7932d53510.tar.bz2
Revert "Mock the LinkDoctor for tests. Should greatly decrease ErrorPage test flakiness."
TBR=darin Review URL: http://codereview.chromium.org/173165 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r--chrome/browser/tab_contents/tab_contents.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 7056fe5..18880c1 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -141,6 +141,9 @@ 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,
@@ -2256,8 +2259,7 @@ GURL TabContents::GetAlternateErrorPageURL() const {
PrefService* prefs = profile()->GetPrefs();
DCHECK(prefs);
if (prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled)) {
- url = google_util::AppendGoogleLocaleParam(
- GURL(google_util::kLinkDoctorBaseURL));
+ url = google_util::AppendGoogleLocaleParam(GURL(kLinkDoctorBaseURL));
url = google_util::AppendGoogleTLDParam(url);
}
return url;