| Index: content/browser/devtools/protocol/devtools_protocol_browsertest.cc
|
| diff --git a/content/browser/devtools/protocol/devtools_protocol_browsertest.cc b/content/browser/devtools/protocol/devtools_protocol_browsertest.cc
|
| index 3f471114c644b21b641cf2346688d2e549b3723e..56522599da179c37399219401dde7e541112d40e 100644
|
| --- a/content/browser/devtools/protocol/devtools_protocol_browsertest.cc
|
| +++ b/content/browser/devtools/protocol/devtools_protocol_browsertest.cc
|
| @@ -47,12 +47,12 @@ class DevToolsProtocolTest : public ContentBrowserTest,
|
|
|
| protected:
|
| void SendCommand(const std::string& method,
|
| - scoped_ptr<base::DictionaryValue> params) {
|
| + std::unique_ptr<base::DictionaryValue> params) {
|
| SendCommand(method, std::move(params), true);
|
| }
|
|
|
| void SendCommand(const std::string& method,
|
| - scoped_ptr<base::DictionaryValue> params,
|
| + std::unique_ptr<base::DictionaryValue> params,
|
| bool wait) {
|
| in_dispatch_ = true;
|
| base::DictionaryValue command;
|
| @@ -115,7 +115,7 @@ class DevToolsProtocolTest : public ContentBrowserTest,
|
| RunMessageLoop();
|
| }
|
|
|
| - scoped_ptr<base::DictionaryValue> result_;
|
| + std::unique_ptr<base::DictionaryValue> result_;
|
| scoped_refptr<DevToolsAgentHost> agent_host_;
|
| int last_sent_id_;
|
| std::vector<int> result_ids_;
|
| @@ -124,8 +124,9 @@ class DevToolsProtocolTest : public ContentBrowserTest,
|
| private:
|
| void DispatchProtocolMessage(DevToolsAgentHost* agent_host,
|
| const std::string& message) override {
|
| - scoped_ptr<base::DictionaryValue> root(static_cast<base::DictionaryValue*>(
|
| - base::JSONReader::Read(message).release()));
|
| + std::unique_ptr<base::DictionaryValue> root(
|
| + static_cast<base::DictionaryValue*>(
|
| + base::JSONReader::Read(message).release()));
|
| int id;
|
| if (root->GetInteger("id", &id)) {
|
| result_ids_.push_back(id);
|
| @@ -163,7 +164,7 @@ class SyntheticKeyEventTest : public DevToolsProtocolTest {
|
| int modifier,
|
| int windowsKeyCode,
|
| int nativeKeyCode) {
|
| - scoped_ptr<base::DictionaryValue> params(new base::DictionaryValue());
|
| + std::unique_ptr<base::DictionaryValue> params(new base::DictionaryValue());
|
| params->SetString("type", type);
|
| params->SetInteger("modifiers", modifier);
|
| params->SetInteger("windowsVirtualKeyCode", windowsKeyCode);
|
| @@ -263,7 +264,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, DISABLED_SynthesizePinchGesture) {
|
| shell()->web_contents(),
|
| "domAutomationController.send(window.innerHeight)", &old_height));
|
|
|
| - scoped_ptr<base::DictionaryValue> params(new base::DictionaryValue());
|
| + std::unique_ptr<base::DictionaryValue> params(new base::DictionaryValue());
|
| params->SetInteger("x", old_width / 2);
|
| params->SetInteger("y", old_height / 2);
|
| params->SetDouble("scaleFactor", 2.0);
|
| @@ -293,7 +294,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, DISABLED_SynthesizeScrollGesture) {
|
| "domAutomationController.send(document.body.scrollTop)", &scroll_top));
|
| ASSERT_EQ(0, scroll_top);
|
|
|
| - scoped_ptr<base::DictionaryValue> params(new base::DictionaryValue());
|
| + std::unique_ptr<base::DictionaryValue> params(new base::DictionaryValue());
|
| params->SetInteger("x", 0);
|
| params->SetInteger("y", 0);
|
| params->SetInteger("xDistance", 0);
|
| @@ -317,7 +318,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, DISABLED_SynthesizeTapGesture) {
|
| "domAutomationController.send(document.body.scrollTop)", &scroll_top));
|
| ASSERT_EQ(0, scroll_top);
|
|
|
| - scoped_ptr<base::DictionaryValue> params(new base::DictionaryValue());
|
| + std::unique_ptr<base::DictionaryValue> params(new base::DictionaryValue());
|
| params->SetInteger("x", 16);
|
| params->SetInteger("y", 16);
|
| params->SetString("gestureSourceType", "touch");
|
| @@ -341,7 +342,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, NavigationPreservesMessages) {
|
| Attach();
|
| SendCommand("Page.enable", nullptr, false);
|
|
|
| - scoped_ptr<base::DictionaryValue> params(new base::DictionaryValue());
|
| + std::unique_ptr<base::DictionaryValue> params(new base::DictionaryValue());
|
| test_url = GetTestUrl("devtools", "navigation.html");
|
| params->SetString("url", test_url.spec());
|
| TestNavigationObserver navigation_observer(shell()->web_contents());
|
| @@ -491,7 +492,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, ReloadBlankPage) {
|
| IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, EvaluateInBlankPage) {
|
| NavigateToURLBlockUntilNavigationsComplete(shell(), GURL("about:blank"), 1);
|
| Attach();
|
| - scoped_ptr<base::DictionaryValue> params(new base::DictionaryValue());
|
| + std::unique_ptr<base::DictionaryValue> params(new base::DictionaryValue());
|
| params->SetString("expression", "window");
|
| SendCommand("Runtime.evaluate", std::move(params), true);
|
| bool wasThrown = true;
|
| @@ -506,7 +507,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest,
|
| NavigateToURLBlockUntilNavigationsComplete(shell(), test_url, 1);
|
| Attach();
|
| NavigateToURLBlockUntilNavigationsComplete(shell(), GURL("about:blank"), 1);
|
| - scoped_ptr<base::DictionaryValue> params(new base::DictionaryValue());
|
| + std::unique_ptr<base::DictionaryValue> params(new base::DictionaryValue());
|
| params->SetString("expression", "window");
|
| SendCommand("Runtime.evaluate", std::move(params), true);
|
| bool wasThrown = true;
|
|
|