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

Side by Side Diff: chrome/browser/profile_resetter/profile_resetter_unittest.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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "chrome/browser/profile_resetter/profile_resetter.h" 5 #include "chrome/browser/profile_resetter/profile_resetter.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/json/json_string_value_serializer.h" 10 #include "base/json/json_string_value_serializer.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/prefs/pref_service.h"
14 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
15 #include "base/test/scoped_path_override.h" 14 #include "base/test/scoped_path_override.h"
16 #include "build/build_config.h" 15 #include "build/build_config.h"
17 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 16 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
18 #include "chrome/browser/extensions/extension_service.h" 17 #include "chrome/browser/extensions/extension_service.h"
19 #include "chrome/browser/extensions/extension_service_test_base.h" 18 #include "chrome/browser/extensions/extension_service_test_base.h"
20 #include "chrome/browser/extensions/tab_helper.h" 19 #include "chrome/browser/extensions/tab_helper.h"
21 #include "chrome/browser/prefs/session_startup_pref.h" 20 #include "chrome/browser/prefs/session_startup_pref.h"
22 #include "chrome/browser/profile_resetter/brandcode_config_fetcher.h" 21 #include "chrome/browser/profile_resetter/brandcode_config_fetcher.h"
23 #include "chrome/browser/profile_resetter/profile_reset_report.pb.h" 22 #include "chrome/browser/profile_resetter/profile_reset_report.pb.h"
24 #include "chrome/browser/profile_resetter/profile_resetter_test_base.h" 23 #include "chrome/browser/profile_resetter/profile_resetter_test_base.h"
25 #include "chrome/browser/profile_resetter/resettable_settings_snapshot.h" 24 #include "chrome/browser/profile_resetter/resettable_settings_snapshot.h"
26 #include "chrome/browser/search_engines/template_url_service_factory.h" 25 #include "chrome/browser/search_engines/template_url_service_factory.h"
27 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" 26 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
28 #include "chrome/browser/themes/theme_service.h" 27 #include "chrome/browser/themes/theme_service.h"
29 #include "chrome/browser/themes/theme_service_factory.h" 28 #include "chrome/browser/themes/theme_service_factory.h"
30 #include "chrome/browser/ui/tabs/tab_strip_model.h" 29 #include "chrome/browser/ui/tabs/tab_strip_model.h"
31 #include "chrome/browser/web_data_service_factory.h" 30 #include "chrome/browser/web_data_service_factory.h"
32 #include "chrome/common/pref_names.h" 31 #include "chrome/common/pref_names.h"
33 #include "chrome/test/base/browser_with_test_window_test.h" 32 #include "chrome/test/base/browser_with_test_window_test.h"
34 #include "components/content_settings/core/browser/content_settings_info.h" 33 #include "components/content_settings/core/browser/content_settings_info.h"
35 #include "components/content_settings/core/browser/content_settings_registry.h" 34 #include "components/content_settings/core/browser/content_settings_registry.h"
36 #include "components/content_settings/core/browser/host_content_settings_map.h" 35 #include "components/content_settings/core/browser/host_content_settings_map.h"
37 #include "components/content_settings/core/browser/website_settings_info.h" 36 #include "components/content_settings/core/browser/website_settings_info.h"
37 #include "components/prefs/pref_service.h"
38 #include "components/search_engines/template_url_service.h" 38 #include "components/search_engines/template_url_service.h"
39 #include "components/search_engines/template_url_service_client.h" 39 #include "components/search_engines/template_url_service_client.h"
40 #include "content/public/browser/web_contents.h" 40 #include "content/public/browser/web_contents.h"
41 #include "content/public/test/test_browser_thread.h" 41 #include "content/public/test/test_browser_thread.h"
42 #include "extensions/browser/extension_registry.h" 42 #include "extensions/browser/extension_registry.h"
43 #include "extensions/common/extension.h" 43 #include "extensions/common/extension.h"
44 #include "extensions/common/manifest_constants.h" 44 #include "extensions/common/manifest_constants.h"
45 #include "net/http/http_response_headers.h" 45 #include "net/http/http_response_headers.h"
46 #include "net/http/http_status_code.h" 46 #include "net/http/http_status_code.h"
47 #include "net/url_request/test_url_fetcher_factory.h" 47 #include "net/url_request/test_url_fetcher_factory.h"
(...skipping 1075 matching lines...) Expand 10 before | Expand all | Expand 10 after
1123 new ResettableSettingsSnapshot(profile())); 1123 new ResettableSettingsSnapshot(profile()));
1124 deleted_snapshot->RequestShortcuts(base::Bind(&FeedbackCapture::Fail, 1124 deleted_snapshot->RequestShortcuts(base::Bind(&FeedbackCapture::Fail,
1125 base::Unretained(&capture))); 1125 base::Unretained(&capture)));
1126 deleted_snapshot.reset(); 1126 deleted_snapshot.reset();
1127 // Running remaining tasks shouldn't trigger the callback to be called as 1127 // Running remaining tasks shouldn't trigger the callback to be called as
1128 // |deleted_snapshot| was deleted before it could run. 1128 // |deleted_snapshot| was deleted before it could run.
1129 base::MessageLoop::current()->RunUntilIdle(); 1129 base::MessageLoop::current()->RunUntilIdle();
1130 } 1130 }
1131 1131
1132 } // namespace 1132 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/profile_resetter/profile_resetter.cc ('k') | chrome/browser/profile_resetter/resettable_settings_snapshot.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698