chrome/browser/prerender/prerender_browsertest.cc - Issue 1658793002: Update chrome for new prefs location.

Side by Side Diff: chrome/browser/prerender/prerender_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/prefs/tracked/pref_hash_browsertest.cc ('k') | chrome/browser/prerender/prerender_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 <stddef.h>	5 #include <stddef.h>

6 #include <deque>	6 #include <deque>

7 #include <utility>	7 #include <utility>

8 #include <vector>	8 #include <vector>

9	9

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

11 #include "base/command_line.h"	11 #include "base/command_line.h"

12 #include "base/files/file_path.h"	12 #include "base/files/file_path.h"

13 #include "base/macros.h"	13 #include "base/macros.h"

14 #include "base/memory/ref_counted_memory.h"	14 #include "base/memory/ref_counted_memory.h"

15 #include "base/memory/scoped_vector.h"	15 #include "base/memory/scoped_vector.h"

16 #include "base/memory/weak_ptr.h"	16 #include "base/memory/weak_ptr.h"

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

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

19 #include "base/run_loop.h"	18 #include "base/run_loop.h"

20 #include "base/scoped_observer.h"	19 #include "base/scoped_observer.h"

21 #include "base/stl_util.h"	20 #include "base/stl_util.h"

22 #include "base/strings/string_split.h"	21 #include "base/strings/string_split.h"

23 #include "base/strings/string_util.h"	22 #include "base/strings/string_util.h"

24 #include "base/strings/stringprintf.h"	23 #include "base/strings/stringprintf.h"

25 #include "base/strings/utf_string_conversions.h"	24 #include "base/strings/utf_string_conversions.h"

26 #include "base/test/histogram_tester.h"	25 #include "base/test/histogram_tester.h"

27 #include "base/test/test_timeouts.h"	26 #include "base/test/test_timeouts.h"

28 #include "base/values.h"	27 #include "base/values.h"

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
70 #include "chrome/grit/generated_resources.h"	69 #include "chrome/grit/generated_resources.h"

71 #include "chrome/test/base/in_process_browser_test.h"	70 #include "chrome/test/base/in_process_browser_test.h"

72 #include "chrome/test/base/test_switches.h"	71 #include "chrome/test/base/test_switches.h"

73 #include "chrome/test/base/ui_test_utils.h"	72 #include "chrome/test/base/ui_test_utils.h"

74 #include "components/content_settings/core/browser/host_content_settings_map.h"	73 #include "components/content_settings/core/browser/host_content_settings_map.h"

75 #include "components/favicon/content/content_favicon_driver.h"	74 #include "components/favicon/content/content_favicon_driver.h"

76 #include "components/favicon/core/favicon_driver_observer.h"	75 #include "components/favicon/core/favicon_driver_observer.h"

77 #include "components/omnibox/browser/omnibox_edit_model.h"	76 #include "components/omnibox/browser/omnibox_edit_model.h"

78 #include "components/omnibox/browser/omnibox_popup_model.h"	77 #include "components/omnibox/browser/omnibox_popup_model.h"

79 #include "components/omnibox/browser/omnibox_view.h"	78 #include "components/omnibox/browser/omnibox_view.h"

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

80 #include "components/safe_browsing_db/database_manager.h"	80 #include "components/safe_browsing_db/database_manager.h"

81 #include "components/safe_browsing_db/test_database_manager.h"	81 #include "components/safe_browsing_db/test_database_manager.h"

82 #include "components/variations/entropy_provider.h"	82 #include "components/variations/entropy_provider.h"

83 #include "components/variations/variations_associated_data.h"	83 #include "components/variations/variations_associated_data.h"

84 #include "content/public/browser/browser_message_filter.h"	84 #include "content/public/browser/browser_message_filter.h"

85 #include "content/public/browser/devtools_agent_host.h"	85 #include "content/public/browser/devtools_agent_host.h"

86 #include "content/public/browser/navigation_controller.h"	86 #include "content/public/browser/navigation_controller.h"

87 #include "content/public/browser/navigation_entry.h"	87 #include "content/public/browser/navigation_entry.h"

88 #include "content/public/browser/notification_service.h"	88 #include "content/public/browser/notification_service.h"

89 #include "content/public/browser/render_frame_host.h"	89 #include "content/public/browser/render_frame_host.h"

(...skipping 3957 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
4047	4047

4048 NavigateToDestURL();	4048 NavigateToDestURL();

4049 EXPECT_EQ(1U, task_manager.tasks().size());	4049 EXPECT_EQ(1U, task_manager.tasks().size());

4050 }	4050 }

4051	4051

4052 } // namespace	4052 } // namespace

4053	4053

4054 #endif // defined(ENABLE_TASK_MANAGER)	4054 #endif // defined(ENABLE_TASK_MANAGER)

4055	4055

4056 } // namespace prerender	4056 } // namespace prerender

OLD	NEW