chrome/test/testing_profile.cc - Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir.

Side by Side Diff: chrome/test/testing_profile.cc

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Created 10 years, 4 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

« chrome/chrome_browser.gypi ('K') | « chrome/test/testing_pref_service.cc ('k') | chrome_frame/test/net/fake_external_tab.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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 "chrome/test/testing_profile.h"	5 #include "chrome/test/testing_profile.h"

6	6

7 #include "build/build_config.h"	7 #include "build/build_config.h"

8	8

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

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

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

12 #include "base/message_loop_proxy.h"	12 #include "base/message_loop_proxy.h"

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

14 #include "base/string_number_conversions.h"	14 #include "base/string_number_conversions.h"

15 #include "chrome/browser/autocomplete/autocomplete_classifier.h"	15 #include "chrome/browser/autocomplete/autocomplete_classifier.h"

16 #include "chrome/browser/bookmarks/bookmark_model.h"	16 #include "chrome/browser/bookmarks/bookmark_model.h"

17 #include "chrome/browser/browser_prefs.h"

18 #include "chrome/browser/chrome_thread.h"	17 #include "chrome/browser/chrome_thread.h"

19 #include "chrome/browser/dom_ui/ntp_resource_cache.h"	18 #include "chrome/browser/dom_ui/ntp_resource_cache.h"

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

21 #include "chrome/browser/find_bar_state.h"	20 #include "chrome/browser/find_bar_state.h"

22 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"	21 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"

23 #include "chrome/browser/geolocation/geolocation_permission_context.h"	22 #include "chrome/browser/geolocation/geolocation_permission_context.h"

24 #include "chrome/browser/history/history.h"	23 #include "chrome/browser/history/history.h"

25 #include "chrome/browser/history/history_backend.h"	24 #include "chrome/browser/history/history_backend.h"

26 #include "chrome/browser/history/top_sites.h"	25 #include "chrome/browser/history/top_sites.h"

27 #include "chrome/browser/host_content_settings_map.h"	26 #include "chrome/browser/host_content_settings_map.h"

28 #include "chrome/browser/in_process_webkit/webkit_context.h"	27 #include "chrome/browser/in_process_webkit/webkit_context.h"

29 #include "chrome/browser/net/gaia/token_service.h"	28 #include "chrome/browser/net/gaia/token_service.h"

30 #include "chrome/browser/notifications/desktop_notification_service.h"	29 #include "chrome/browser/notifications/desktop_notification_service.h"

	30 #include "chrome/browser/prefs/browser_prefs.h"

31 #include "chrome/browser/search_engines/template_url_model.h"	31 #include "chrome/browser/search_engines/template_url_model.h"

32 #include "chrome/browser/sessions/session_service.h"	32 #include "chrome/browser/sessions/session_service.h"

33 #include "chrome/browser/sync/profile_sync_service_mock.h"	33 #include "chrome/browser/sync/profile_sync_service_mock.h"

34 #include "chrome/browser/themes/browser_theme_provider.h"	34 #include "chrome/browser/themes/browser_theme_provider.h"

35 #include "chrome/common/chrome_constants.h"	35 #include "chrome/common/chrome_constants.h"

36 #include "chrome/common/net/url_request_context_getter.h"	36 #include "chrome/common/net/url_request_context_getter.h"

37 #include "chrome/common/notification_service.h"	37 #include "chrome/common/notification_service.h"

38 #include "chrome/common/url_constants.h"	38 #include "chrome/common/url_constants.h"

39 #include "chrome/test/testing_pref_service.h"	39 #include "chrome/test/testing_pref_service.h"

40 #include "net/base/cookie_monster.h"	40 #include "net/base/cookie_monster.h"

(...skipping 421 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
462 }	462 }

463 return profile_sync_service_.get();	463 return profile_sync_service_.get();

464 }	464 }

465	465

466 void TestingProfile::DestroyWebDataService() {	466 void TestingProfile::DestroyWebDataService() {

467 if (!web_data_service_.get())	467 if (!web_data_service_.get())

468 return;	468 return;

469	469

470 web_data_service_->Shutdown();	470 web_data_service_->Shutdown();

471 }	471 }

OLD	NEW