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

Side by Side Diff: chrome/browser/history/history_backend_unittest.cc

Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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 <algorithm> 5 #include <algorithm>
6 #include <set> 6 #include <set>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/file_util.h" 13 #include "base/file_util.h"
14 #include "base/files/file_path.h" 14 #include "base/files/file_path.h"
15 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/path_service.h" 17 #include "base/path_service.h"
18 #include "base/string16.h" 18 #include "base/string16.h"
19 #include "base/strings/string_number_conversions.h" 19 #include "base/strings/string_number_conversions.h"
20 #include "base/utf_string_conversions.h" 20 #include "base/strings/utf_string_conversions.h"
21 #include "chrome/browser/bookmarks/bookmark_model.h" 21 #include "chrome/browser/bookmarks/bookmark_model.h"
22 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 22 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
23 #include "chrome/browser/bookmarks/bookmark_utils.h" 23 #include "chrome/browser/bookmarks/bookmark_utils.h"
24 #include "chrome/browser/favicon/imported_favicon_usage.h" 24 #include "chrome/browser/favicon/imported_favicon_usage.h"
25 #include "chrome/browser/history/history_backend.h" 25 #include "chrome/browser/history/history_backend.h"
26 #include "chrome/browser/history/history_notifications.h" 26 #include "chrome/browser/history/history_notifications.h"
27 #include "chrome/browser/history/history_service.h" 27 #include "chrome/browser/history/history_service.h"
28 #include "chrome/browser/history/history_service_factory.h" 28 #include "chrome/browser/history/history_service_factory.h"
29 #include "chrome/browser/history/in_memory_database.h" 29 #include "chrome/browser/history/in_memory_database.h"
30 #include "chrome/browser/history/in_memory_history_backend.h" 30 #include "chrome/browser/history/in_memory_history_backend.h"
(...skipping 2778 matching lines...) Expand 10 before | Expand all | Expand 10 after
2809 service->AddPage( 2809 service->AddPage(
2810 url, base::Time::Now(), NULL, 1, GURL(), RedirectList(), 2810 url, base::Time::Now(), NULL, 1, GURL(), RedirectList(),
2811 content::PAGE_TRANSITION_TYPED, SOURCE_BROWSED, false); 2811 content::PAGE_TRANSITION_TYPED, SOURCE_BROWSED, false);
2812 2812
2813 // This won't actually delete the URL, rather it'll empty out the visits. 2813 // This won't actually delete the URL, rather it'll empty out the visits.
2814 // This triggers blocking on the BookmarkModel. 2814 // This triggers blocking on the BookmarkModel.
2815 service->DeleteURL(url); 2815 service->DeleteURL(url);
2816 } 2816 }
2817 2817
2818 } // namespace history 2818 } // namespace history
OLDNEW
« no previous file with comments | « chrome/browser/history/history_backend.cc ('k') | chrome/browser/history/history_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698