Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(562)

Side by Side Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 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 | Annotate | Revision Log
OLDNEW
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 <deque> 5 #include <deque>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/prefs/pref_service.h"
10 #include "base/string_util.h" 11 #include "base/string_util.h"
11 #include "base/stringprintf.h" 12 #include "base/stringprintf.h"
12 #include "base/test/test_timeouts.h" 13 #include "base/test/test_timeouts.h"
13 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
14 #include "base/values.h" 15 #include "base/values.h"
15 #include "chrome/browser/browsing_data/browsing_data_helper.h" 16 #include "chrome/browser/browsing_data/browsing_data_helper.h"
16 #include "chrome/browser/browsing_data/browsing_data_remover.h" 17 #include "chrome/browser/browsing_data/browsing_data_remover.h"
17 #include "chrome/browser/content_settings/host_content_settings_map.h" 18 #include "chrome/browser/content_settings/host_content_settings_map.h"
18 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" 19 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
19 #include "chrome/browser/extensions/extension_apitest.h" 20 #include "chrome/browser/extensions/extension_apitest.h"
20 #include "chrome/browser/favicon/favicon_tab_helper.h" 21 #include "chrome/browser/favicon/favicon_tab_helper.h"
21 #include "chrome/browser/prefs/pref_service.h"
22 #include "chrome/browser/prerender/prerender_contents.h" 22 #include "chrome/browser/prerender/prerender_contents.h"
23 #include "chrome/browser/prerender/prerender_handle.h" 23 #include "chrome/browser/prerender/prerender_handle.h"
24 #include "chrome/browser/prerender/prerender_link_manager.h" 24 #include "chrome/browser/prerender/prerender_link_manager.h"
25 #include "chrome/browser/prerender/prerender_link_manager_factory.h" 25 #include "chrome/browser/prerender/prerender_link_manager_factory.h"
26 #include "chrome/browser/prerender/prerender_manager.h" 26 #include "chrome/browser/prerender/prerender_manager.h"
27 #include "chrome/browser/prerender/prerender_manager_factory.h" 27 #include "chrome/browser/prerender/prerender_manager_factory.h"
28 #include "chrome/browser/profiles/profile.h" 28 #include "chrome/browser/profiles/profile.h"
29 #include "chrome/browser/safe_browsing/database_manager.h" 29 #include "chrome/browser/safe_browsing/database_manager.h"
30 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 30 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
31 #include "chrome/browser/safe_browsing/safe_browsing_util.h" 31 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
(...skipping 2693 matching lines...) Expand 10 before | Expand all | Expand 10 after
2725 channel_close_watcher.WatchChannel(browser()->tab_strip_model()-> 2725 channel_close_watcher.WatchChannel(browser()->tab_strip_model()->
2726 GetActiveWebContents()->GetRenderProcessHost()); 2726 GetActiveWebContents()->GetRenderProcessHost());
2727 NavigateToDestURL(); 2727 NavigateToDestURL();
2728 channel_close_watcher.WaitForChannelClose(); 2728 channel_close_watcher.WaitForChannelClose();
2729 2729
2730 ASSERT_TRUE(IsEmptyPrerenderLinkManager()); 2730 ASSERT_TRUE(IsEmptyPrerenderLinkManager());
2731 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); 2731 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
2732 } 2732 }
2733 2733
2734 } // namespace prerender 2734 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/prefs/session_startup_pref.cc ('k') | chrome/browser/prerender/prerender_field_trial.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698