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

Unified Diff: content/public/test/test_utils.h

Issue 1874903002: Convert //content from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix indent Created 4 years, 8 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 | « content/public/test/test_synchronous_compositor_android.cc ('k') | content/public/test/test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/test_utils.h
diff --git a/content/public/test/test_utils.h b/content/public/test/test_utils.h
index 545036a1008d362b00f6712483e7e60a74a4b243..3e4654f44838b0162e5d1edd3ccdc41920dcb4a0 100644
--- a/content/public/test/test_utils.h
+++ b/content/public/test/test_utils.h
@@ -5,10 +5,11 @@
#ifndef CONTENT_PUBLIC_TEST_TEST_UTILS_H_
#define CONTENT_PUBLIC_TEST_TEST_UTILS_H_
+#include <memory>
+
#include "base/callback.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/run_loop.h"
#include "build/build_config.h"
#include "content/public/browser/browser_child_process_observer.h"
@@ -64,8 +65,9 @@ base::Closure GetQuitTaskForRunLoop(base::RunLoop* run_loop);
// MessageLoop. When the result is available, it is returned.
// This should not be used; the use of the ExecuteScript functions in
// browser_test_utils is preferable.
-scoped_ptr<base::Value> ExecuteScriptAndGetValue(
- RenderFrameHost* render_frame_host, const std::string& script);
+std::unique_ptr<base::Value> ExecuteScriptAndGetValue(
+ RenderFrameHost* render_frame_host,
+ const std::string& script);
// Returns true if all sites are isolated. Typically used to bail from a test
// that is incompatible with --site-per-process.
@@ -256,7 +258,7 @@ class RenderFrameDeletedObserver : public WebContentsObserver {
int process_id_;
int routing_id_;
bool deleted_;
- scoped_ptr<base::RunLoop> runner_;
+ std::unique_ptr<base::RunLoop> runner_;
DISALLOW_COPY_AND_ASSIGN(RenderFrameDeletedObserver);
};
« no previous file with comments | « content/public/test/test_synchronous_compositor_android.cc ('k') | content/public/test/test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698