chrome/browser/safe_browsing/client_side_detection_host_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/safe_browsing/client_side_detection_host_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/safe_browsing/bloom_filter_unittest.cc ('k') | chrome/browser/safe_browsing/client_side_detection_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/client_side_detection_host_unittest.cc

diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc

index 9637580fc82f16efd6b110cfa734d5b6353c3eb0..14486949e796da5dafcd74dbea04a1054ec715db 100644

--- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc

+++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc

@@ -6,11 +6,13 @@

#include "base/file_path.h"

#include "base/memory/ref_counted.h"

#include "base/memory/scoped_ptr.h"

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

+#include "base/scoped_temp_dir.h"

#include "base/task.h"

#include "chrome/browser/safe_browsing/client_side_detection_host.h"

#include "chrome/browser/safe_browsing/client_side_detection_service.h"

#include "chrome/browser/safe_browsing/safe_browsing_service.h"

+#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

+#include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/safe_browsing/csd.pb.h"

#include "chrome/common/safe_browsing/safebrowsing_messages.h"

@@ -18,8 +20,6 @@

#include "chrome/test/ui_test_utils.h"

#include "content/browser/browser_thread.h"

#include "content/browser/renderer_host/test_render_view_host.h"

-#include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h"

-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

#include "content/browser/tab_contents/test_tab_contents.h"

#include "googleurl/src/gurl.h"

#include "ipc/ipc_test_sink.h"