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

Side by Side Diff: chrome/browser/history/history_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) 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 // History unit tests come in two flavors: 5 // History unit tests come in two flavors:
6 // 6 //
7 // 1. The more complicated style is that the unit test creates a full history 7 // 1. The more complicated style is that the unit test creates a full history
8 // service. This spawns a background thread for the history backend, and 8 // service. This spawns a background thread for the history backend, and
9 // all communication is asynchronous. This is useful for testing more 9 // all communication is asynchronous. This is useful for testing more
10 // complicated things or end-to-end behavior. 10 // complicated things or end-to-end behavior.
(...skipping 10 matching lines...) Expand all
21 21
22 #include <algorithm> 22 #include <algorithm>
23 #include <string> 23 #include <string>
24 24
25 #include "base/basictypes.h" 25 #include "base/basictypes.h"
26 #include "base/bind.h" 26 #include "base/bind.h"
27 #include "base/bind_helpers.h" 27 #include "base/bind_helpers.h"
28 #include "base/callback.h" 28 #include "base/callback.h"
29 #include "base/command_line.h" 29 #include "base/command_line.h"
30 #include "base/compiler_specific.h" 30 #include "base/compiler_specific.h"
31 #include "base/file_util.h"
32 #include "base/files/file_path.h" 31 #include "base/files/file_path.h"
32 #include "base/files/file_util.h"
33 #include "base/files/scoped_temp_dir.h" 33 #include "base/files/scoped_temp_dir.h"
34 #include "base/logging.h" 34 #include "base/logging.h"
35 #include "base/memory/scoped_ptr.h" 35 #include "base/memory/scoped_ptr.h"
36 #include "base/memory/scoped_vector.h" 36 #include "base/memory/scoped_vector.h"
37 #include "base/message_loop/message_loop.h" 37 #include "base/message_loop/message_loop.h"
38 #include "base/path_service.h" 38 #include "base/path_service.h"
39 #include "base/strings/string_util.h" 39 #include "base/strings/string_util.h"
40 #include "base/strings/stringprintf.h" 40 #include "base/strings/stringprintf.h"
41 #include "base/strings/utf_string_conversions.h" 41 #include "base/strings/utf_string_conversions.h"
42 #include "base/task/cancelable_task_tracker.h" 42 #include "base/task/cancelable_task_tracker.h"
(...skipping 1822 matching lines...) Expand 10 before | Expand all | Expand 10 after
1865 std::vector<PageUsageData*> results; 1865 std::vector<PageUsageData*> results;
1866 db_->QuerySegmentUsage(segment_time, 10, &results); 1866 db_->QuerySegmentUsage(segment_time, 10, &results);
1867 ASSERT_EQ(1u, results.size()); 1867 ASSERT_EQ(1u, results.size());
1868 EXPECT_EQ(url, results[0]->GetURL()); 1868 EXPECT_EQ(url, results[0]->GetURL());
1869 EXPECT_EQ(segment_id, results[0]->GetID()); 1869 EXPECT_EQ(segment_id, results[0]->GetID());
1870 EXPECT_EQ(title, results[0]->GetTitle()); 1870 EXPECT_EQ(title, results[0]->GetTitle());
1871 STLDeleteElements(&results); 1871 STLDeleteElements(&results);
1872 } 1872 }
1873 1873
1874 } // namespace history 1874 } // namespace history
OLDNEW
« no previous file with comments | « chrome/browser/history/history_querying_unittest.cc ('k') | chrome/browser/history/history_unittest_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698