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

Unified Diff: chrome/browser/extensions/extension_api_unittest.h

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header 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
Index: chrome/browser/extensions/extension_api_unittest.h
diff --git a/chrome/browser/extensions/extension_api_unittest.h b/chrome/browser/extensions/extension_api_unittest.h
index 85df0ff0179308ad6a4198df7e1befd4af7f6ad4..74fe1ce0d9436476d2cde624638ad83e1f1aecd6 100644
--- a/chrome/browser/extensions/extension_api_unittest.h
+++ b/chrome/browser/extensions/extension_api_unittest.h
@@ -5,10 +5,10 @@
#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_API_UNITTEST_H_
#define CHROME_BROWSER_EXTENSIONS_EXTENSION_API_UNITTEST_H_
+#include <memory>
#include <string>
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/test/base/browser_with_test_window_test.h"
namespace base {
@@ -53,18 +53,21 @@ class ExtensionApiUnittest : public BrowserWithTestWindowTest {
// See also the RunFunction* methods in extension_function_test_utils.h.
// Return the function result as a base::Value.
- scoped_ptr<base::Value> RunFunctionAndReturnValue(
- UIThreadExtensionFunction* function, const std::string& args);
+ std::unique_ptr<base::Value> RunFunctionAndReturnValue(
+ UIThreadExtensionFunction* function,
+ const std::string& args);
// Return the function result as a base::DictionaryValue, or NULL.
// This will EXPECT-fail if the result is not a DictionaryValue.
- scoped_ptr<base::DictionaryValue> RunFunctionAndReturnDictionary(
- UIThreadExtensionFunction* function, const std::string& args);
+ std::unique_ptr<base::DictionaryValue> RunFunctionAndReturnDictionary(
+ UIThreadExtensionFunction* function,
+ const std::string& args);
// Return the function result as a base::ListValue, or NULL.
// This will EXPECT-fail if the result is not a ListValue.
- scoped_ptr<base::ListValue> RunFunctionAndReturnList(
- UIThreadExtensionFunction* function, const std::string& args);
+ std::unique_ptr<base::ListValue> RunFunctionAndReturnList(
+ UIThreadExtensionFunction* function,
+ const std::string& args);
// Return an error thrown from the function, if one exists.
// This will EXPECT-fail if any result is returned from the function.
« no previous file with comments | « chrome/browser/extensions/extension_action_unittest.cc ('k') | chrome/browser/extensions/extension_api_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698