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

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

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 6 years, 3 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) 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 "base/json/json_string_value_serializer.h" 7 #include "base/json/json_string_value_serializer.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/test/scoped_path_override.h" 10 #include "base/test/scoped_path_override.h"
(...skipping 20 matching lines...) Expand all
31 #include "content/public/test/test_browser_thread.h" 31 #include "content/public/test/test_browser_thread.h"
32 #include "extensions/common/extension.h" 32 #include "extensions/common/extension.h"
33 #include "extensions/common/manifest_constants.h" 33 #include "extensions/common/manifest_constants.h"
34 #include "net/http/http_response_headers.h" 34 #include "net/http/http_response_headers.h"
35 #include "net/http/http_status_code.h" 35 #include "net/http/http_status_code.h"
36 #include "net/url_request/test_url_fetcher_factory.h" 36 #include "net/url_request/test_url_fetcher_factory.h"
37 #include "net/url_request/url_request_status.h" 37 #include "net/url_request/url_request_status.h"
38 #include "url/gurl.h" 38 #include "url/gurl.h"
39 39
40 #if defined(OS_WIN) 40 #if defined(OS_WIN)
41 #include "base/file_util.h" 41 #include "base/files/file_util.h"
42 #include "base/path_service.h" 42 #include "base/path_service.h"
43 #include "base/process/process_handle.h" 43 #include "base/process/process_handle.h"
44 #include "base/rand_util.h" 44 #include "base/rand_util.h"
45 #include "base/strings/string_number_conversions.h" 45 #include "base/strings/string_number_conversions.h"
46 #include "base/win/scoped_com_initializer.h" 46 #include "base/win/scoped_com_initializer.h"
47 #include "base/win/shortcut.h" 47 #include "base/win/shortcut.h"
48 #endif 48 #endif
49 49
50 50
51 namespace { 51 namespace {
(...skipping 1044 matching lines...) Expand 10 before | Expand all | Expand 10 after
1096 new ResettableSettingsSnapshot(profile())); 1096 new ResettableSettingsSnapshot(profile()));
1097 deleted_snapshot->RequestShortcuts(base::Bind(&FeedbackCapture::Fail, 1097 deleted_snapshot->RequestShortcuts(base::Bind(&FeedbackCapture::Fail,
1098 base::Unretained(&capture))); 1098 base::Unretained(&capture)));
1099 deleted_snapshot.reset(); 1099 deleted_snapshot.reset();
1100 // Running remaining tasks shouldn't trigger the callback to be called as 1100 // Running remaining tasks shouldn't trigger the callback to be called as
1101 // |deleted_snapshot| was deleted before it could run. 1101 // |deleted_snapshot| was deleted before it could run.
1102 base::MessageLoop::current()->RunUntilIdle(); 1102 base::MessageLoop::current()->RunUntilIdle();
1103 } 1103 }
1104 1104
1105 } // namespace 1105 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/process_singleton_posix_unittest.cc ('k') | chrome/browser/profiles/file_path_verifier_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698