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

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

Unified Diff: chrome/browser/importer/importer_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: unknwn 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/importer/firefox_profile_lock_unittest.cc ('k') | chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/importer/importer_unittest.cc

diff --git a/chrome/browser/importer/importer_unittest.cc b/chrome/browser/importer/importer_unittest.cc

index f0f190a39304710f2a676866b5f0da1fb9add36c..6764ef62d29c79ea14eaa1c1304f789706e83e4d 100644

--- a/chrome/browser/importer/importer_unittest.cc

+++ b/chrome/browser/importer/importer_unittest.cc

@@ -10,8 +10,8 @@

#include <unknwn.h>

#include <intshcut.h>

#include <pstore.h>

-#include <urlhist.h>

#include <shlguid.h>

+#include <urlhist.h>

#endif

#include <vector>

@@ -21,10 +21,10 @@

#include "base/file_util.h"

#include "base/message_loop.h"

#include "base/path_service.h"

+#include "base/scoped_temp_dir.h"

#include "base/stl_util-inl.h"

#include "base/string_util.h"

#include "base/utf_string_conversions.h"

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

#include "chrome/browser/history/history_types.h"

#include "chrome/browser/importer/importer_bridge.h"

#include "chrome/browser/importer/importer_data_types.h"