chrome/browser/search_engines/template_url_prepopulate_data_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/search_engines/template_url_prepopulate_data_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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/search_engines/template_url_model_test_util.cc ('k') | chrome/browser/sessions/session_backend_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc

diff --git a/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc b/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc

index fe0171bd136dbe7d07425495b65cfeb319b38a35..327420f5c177ba1f630000579c74d34ae7f54063 100644

--- a/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc

+++ b/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc

@@ -3,14 +3,14 @@

// found in the LICENSE file.

#include "base/file_util.h"

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

#include "base/memory/scoped_vector.h"

+#include "base/scoped_temp_dir.h"

#include "base/utf_string_conversions.h"

#include "chrome/browser/search_engines/search_engine_type.h"

#include "chrome/browser/search_engines/search_terms_data.h"

#include "chrome/browser/search_engines/template_url.h"

-#include "chrome/browser/search_engines/template_url_prepopulate_data.h"

#include "chrome/browser/search_engines/template_url_model.h"

+#include "chrome/browser/search_engines/template_url_prepopulate_data.h"

#include "chrome/common/pref_names.h"

#include "chrome/test/testing_pref_service.h"

#include "chrome/test/testing_profile.h"