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

Side by Side Diff: chrome/browser/profile_resetter/profile_resetter_unittest.cc

Issue 1548133002: Switch to standard integer types in chrome/browser/, part 3 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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>
8
7 #include "base/json/json_string_value_serializer.h" 9 #include "base/json/json_string_value_serializer.h"
10 #include "base/macros.h"
8 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
9 #include "base/prefs/pref_service.h" 12 #include "base/prefs/pref_service.h"
10 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
11 #include "base/test/scoped_path_override.h" 14 #include "base/test/scoped_path_override.h"
15 #include "build/build_config.h"
12 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 16 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
13 #include "chrome/browser/extensions/extension_service.h" 17 #include "chrome/browser/extensions/extension_service.h"
14 #include "chrome/browser/extensions/extension_service_test_base.h" 18 #include "chrome/browser/extensions/extension_service_test_base.h"
15 #include "chrome/browser/extensions/tab_helper.h" 19 #include "chrome/browser/extensions/tab_helper.h"
16 #include "chrome/browser/prefs/session_startup_pref.h" 20 #include "chrome/browser/prefs/session_startup_pref.h"
17 #include "chrome/browser/profile_resetter/brandcode_config_fetcher.h" 21 #include "chrome/browser/profile_resetter/brandcode_config_fetcher.h"
18 #include "chrome/browser/profile_resetter/profile_reset_report.pb.h" 22 #include "chrome/browser/profile_resetter/profile_reset_report.pb.h"
19 #include "chrome/browser/profile_resetter/profile_resetter_test_base.h" 23 #include "chrome/browser/profile_resetter/profile_resetter_test_base.h"
20 #include "chrome/browser/profile_resetter/resettable_settings_snapshot.h" 24 #include "chrome/browser/profile_resetter/resettable_settings_snapshot.h"
21 #include "chrome/browser/search_engines/template_url_service_factory.h" 25 #include "chrome/browser/search_engines/template_url_service_factory.h"
(...skipping 1096 matching lines...) Expand 10 before | Expand all | Expand 10 after
1118 new ResettableSettingsSnapshot(profile())); 1122 new ResettableSettingsSnapshot(profile()));
1119 deleted_snapshot->RequestShortcuts(base::Bind(&FeedbackCapture::Fail, 1123 deleted_snapshot->RequestShortcuts(base::Bind(&FeedbackCapture::Fail,
1120 base::Unretained(&capture))); 1124 base::Unretained(&capture)));
1121 deleted_snapshot.reset(); 1125 deleted_snapshot.reset();
1122 // Running remaining tasks shouldn't trigger the callback to be called as 1126 // Running remaining tasks shouldn't trigger the callback to be called as
1123 // |deleted_snapshot| was deleted before it could run. 1127 // |deleted_snapshot| was deleted before it could run.
1124 base::MessageLoop::current()->RunUntilIdle(); 1128 base::MessageLoop::current()->RunUntilIdle();
1125 } 1129 }
1126 1130
1127 } // namespace 1131 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/profile_resetter/profile_resetter_test_base.h ('k') | chrome/browser/profile_resetter/reset_report_uploader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698