chrome/browser/net/dns_probe_browsertest.cc - Issue 1658793002: Update chrome for new prefs location.

Side by Side Diff: chrome/browser/net/dns_probe_browsertest.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « chrome/browser/net/disk_cache_dir_policy_handler_unittest.cc ('k') | chrome/browser/net/http_server_properties_manager_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include <set>	5 #include <set>

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/memory/scoped_ptr.h"	8 #include "base/memory/scoped_ptr.h"

9 #include "base/message_loop/message_loop.h"	9 #include "base/message_loop/message_loop.h"

10 #include "base/path_service.h"	10 #include "base/path_service.h"

11 #include "base/prefs/pref_service.h"

12 #include "base/run_loop.h"	11 #include "base/run_loop.h"

13 #include "base/threading/thread_restrictions.h"	12 #include "base/threading/thread_restrictions.h"

14 #include "chrome/browser/browser_process.h"	13 #include "chrome/browser/browser_process.h"

15 #include "chrome/browser/io_thread.h"	14 #include "chrome/browser/io_thread.h"

16 #include "chrome/browser/net/dns_probe_test_util.h"	15 #include "chrome/browser/net/dns_probe_test_util.h"

17 #include "chrome/browser/net/net_error_tab_helper.h"	16 #include "chrome/browser/net/net_error_tab_helper.h"

18 #include "chrome/browser/net/url_request_mock_util.h"	17 #include "chrome/browser/net/url_request_mock_util.h"

19 #include "chrome/browser/profiles/profile.h"	18 #include "chrome/browser/profiles/profile.h"

20 #include "chrome/browser/ui/browser.h"	19 #include "chrome/browser/ui/browser.h"

21 #include "chrome/browser/ui/browser_commands.h"	20 #include "chrome/browser/ui/browser_commands.h"

22 #include "chrome/browser/ui/tabs/tab_strip_model.h"	21 #include "chrome/browser/ui/tabs/tab_strip_model.h"

23 #include "chrome/common/chrome_paths.h"	22 #include "chrome/common/chrome_paths.h"

24 #include "chrome/common/pref_names.h"	23 #include "chrome/common/pref_names.h"

25 #include "chrome/test/base/in_process_browser_test.h"	24 #include "chrome/test/base/in_process_browser_test.h"

26 #include "chrome/test/base/ui_test_utils.h"	25 #include "chrome/test/base/ui_test_utils.h"

27 #include "components/error_page/common/net_error_info.h"	26 #include "components/error_page/common/net_error_info.h"

28 #include "components/google/core/browser/google_util.h"	27 #include "components/google/core/browser/google_util.h"

	28 #include "components/prefs/pref_service.h"

29 #include "content/public/browser/browser_thread.h"	29 #include "content/public/browser/browser_thread.h"

30 #include "content/public/browser/web_contents.h"	30 #include "content/public/browser/web_contents.h"

31 #include "content/public/test/browser_test_utils.h"	31 #include "content/public/test/browser_test_utils.h"

32 #include "content/public/test/test_navigation_observer.h"	32 #include "content/public/test/test_navigation_observer.h"

33 #include "net/base/net_errors.h"	33 #include "net/base/net_errors.h"

34 #include "net/dns/dns_test_util.h"	34 #include "net/dns/dns_test_util.h"

35 #include "net/test/url_request/url_request_failed_job.h"	35 #include "net/test/url_request/url_request_failed_job.h"

36 #include "net/test/url_request/url_request_mock_http_job.h"	36 #include "net/test/url_request/url_request_mock_http_job.h"

37 #include "net/url_request/url_request_filter.h"	37 #include "net/url_request/url_request_filter.h"

38 #include "net/url_request/url_request_interceptor.h"	38 #include "net/url_request/url_request_interceptor.h"

(...skipping 946 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
985	985

986 EXPECT_EQ(error_page::DNS_PROBE_FINISHED_INCONCLUSIVE,	986 EXPECT_EQ(error_page::DNS_PROBE_FINISHED_INCONCLUSIVE,

987 WaitForSentStatus());	987 WaitForSentStatus());

988 EXPECT_EQ(0, pending_status_count());	988 EXPECT_EQ(0, pending_status_count());

989 ExpectDisplayingLocalErrorPage("ERR_NAME_NOT_RESOLVED");	989 ExpectDisplayingLocalErrorPage("ERR_NAME_NOT_RESOLVED");

990 }	990 }

991	991

992 } // namespace	992 } // namespace

993	993

994 } // namespace chrome_browser_net	994 } // namespace chrome_browser_net

OLD	NEW