chrome/browser/history/top_sites_unittest.cc - Issue 7048007: Move scoped_temp_dir and scoped_native_library back from base/memory to base.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 7048007: Move scoped_temp_dir and scoped_native_library back from base/memory to base. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: scriptfix Created 9 years, 7 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

« no previous file with comments | « chrome/browser/history/thumbnail_database_unittest.cc ('k') | chrome/browser/history/url_database_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 "base/command_line.h"	5 #include "base/command_line.h"

6 #include "base/file_util.h"	6 #include "base/file_util.h"

7 #include "base/format_macros.h"	7 #include "base/format_macros.h"

8 #include "base/memory/scoped_temp_dir.h"

9 #include "base/path_service.h"	8 #include "base/path_service.h"

	9 #include "base/scoped_temp_dir.h"

10 #include "base/string_util.h"	10 #include "base/string_util.h"

11 #include "base/utf_string_conversions.h"	11 #include "base/utf_string_conversions.h"

12 #include "base/values.h"	12 #include "base/values.h"

13 #include "chrome/browser/history/history_backend.h"	13 #include "chrome/browser/history/history_backend.h"

14 #include "chrome/browser/history/history_database.h"	14 #include "chrome/browser/history/history_database.h"

15 #include "chrome/browser/history/history_marshaling.h"	15 #include "chrome/browser/history/history_marshaling.h"

16 #include "chrome/browser/history/history_notifications.h"	16 #include "chrome/browser/history/history_notifications.h"

17 #include "chrome/browser/history/history_unittest_base.h"	17 #include "chrome/browser/history/history_unittest_base.h"

18 #include "chrome/browser/history/top_sites.h"	18 #include "chrome/browser/history/top_sites.h"

19 #include "chrome/browser/history/top_sites_backend.h"	19 #include "chrome/browser/history/top_sites_backend.h"

(...skipping 1314 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1334 WaitForTopSites();	1334 WaitForTopSites();

1335 EXPECT_FALSE(IsTopSitesLoaded());	1335 EXPECT_FALSE(IsTopSitesLoaded());

1336	1336

1337 // Load history, which should make TopSites finish loading too.	1337 // Load history, which should make TopSites finish loading too.

1338 profile()->CreateHistoryService(false, false);	1338 profile()->CreateHistoryService(false, false);

1339 profile()->BlockUntilTopSitesLoaded();	1339 profile()->BlockUntilTopSitesLoaded();

1340 EXPECT_TRUE(IsTopSitesLoaded());	1340 EXPECT_TRUE(IsTopSitesLoaded());

1341 }	1341 }

1342	1342

1343 } // namespace history	1343 } // namespace history

OLD	NEW