Merge 262846 "Revert 255617, due to it not tracking use of the link doctor page."

chrome/browser/net/url_request_mock_util.cc

 // 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.
 
 #include "chrome/browser/net/url_request_mock_util.h"
 
 #include <string>
 
 #include "base/path_service.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 23 matching lines @@
     net::URLRequestFilter::GetInstance()->ClearHandlers();
 
     content::URLRequestFailedJob::AddUrlHandler();
     content::URLRequestSlowDownloadJob::AddUrlHandler();
 
     base::FilePath root_http;
     PathService::Get(chrome::DIR_TEST_DATA, &root_http);
     content::URLRequestMockHTTPJob::AddUrlHandler(root_http);
     content::URLRequestMockHTTPJob::AddHostnameToFileHandler(
         google_util::LinkDoctorBaseURL().host(),
-        root_http.AppendASCII("mock-link-doctor.json"));
+        root_http.AppendASCII("mock-link-doctor.html"));
   } else {
     // Revert to the default handlers.
     net::URLRequestFilter::GetInstance()->ClearHandlers();
   }
 }
 
 }  // namespace chrome_browser_net