[New Tab Page] Change the mechanism to intercept online NTP errors

chrome/browser/browsing_data/browsing_data_remover_browsertest.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 "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_test_util.h"
@@ skipping 11 matching lines @@
 #include "content/public/common/content_paths.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/download_test_observer.h"
 #include "net/test/url_request/url_request_mock_http_job.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
 namespace {
 void SetUrlRequestMock(const base::FilePath& path) {
-  net::URLRequestMockHTTPJob::AddUrlHandler(path,
-                                            BrowserThread::GetBlockingPool());
+  net::URLRequestMockHTTPJob::AddUrlHandlers(path,
+                                             BrowserThread::GetBlockingPool());

[mmenke, 2015/01/15 22:35:30]

Optional:  While you're here, could break the dependency on how mock handlers
are installed by using SetUrlRequestMocksEnabled(true) here instead.  This file
will still need to depend on URLRequestMockHTTPJob, though.  Still think it's an
improvement, though.

Could do it for PolicyBrowserTest as well, but not for the content/ tests.

[Mathieu, 2015/01/22 19:21:58]

Actually both this test and the PolicyBrowserTest need to serve from
content::DIR_TEST_DATA.

 }
 }
 
 class BrowsingDataRemoverBrowserTest : public InProcessBrowserTest {
  public:
   BrowsingDataRemoverBrowserTest() {}
 
   void SetUpOnMainThread() override {
     base::FilePath path;
     PathService::Get(content::DIR_TEST_DATA, &path);
@@ skipping 86 matching lines @@
   ui_test_utils::NavigateToURL(browser(), url);
   RunScriptAndCheckResult("createTable()", "done");
   RunScriptAndCheckResult("insertRecord('text2')", "done");
   RunScriptAndCheckResult("getRecords()", "text2");
 }
 
 // Profile::ClearNetworkingHistorySince should be exercised here too see whether
 // the call gets delegated through ProfileIO[Impl]Data properly, which is hard
 // to write unit-tests for. Currently this is done by both of the above tests.
 // Add standalone test if this changes.