Commit fa744efa authored by Noel Gordon's avatar Noel Gordon Committed by Commit Bot

<linked_ptr> is deprecated

Bug: 833834
Change-Id: I4eb15bf48c996adad73f72597718b82af1069654
Reviewed-on: https://chromium-review.googlesource.com/1045948
Commit-Queue: Noel Gordon <noel@chromium.org>
Reviewed-by: default avatarStuart Langley <slangley@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556361}
parent 44700b6e
......@@ -582,7 +582,7 @@ void FileManagerBrowserTestBase::SetUpOnMainThread() {
CHECK(embedded_test_server()->Start());
const GURL share_url_base(embedded_test_server()->GetURL(
"/chromeos/file_manager/share_dialog_mock/index.html"));
drive_volume_ = drive_volumes_[profile()->GetOriginalProfile()];
drive_volume_ = std::move(drive_volumes_[profile()->GetOriginalProfile()]);
drive_volume_->ConfigureShareUrlBase(share_url_base);
test_util::WaitUntilDriveMountPointIsAdded(profile());
}
......@@ -724,7 +724,7 @@ void FileManagerBrowserTestBase::OnCommand(const std::string& name,
local_volume_->CreateEntry(*message.entries[i]);
break;
case DRIVE_VOLUME:
if (drive_volume_.get())
if (drive_volume_)
drive_volume_->CreateEntry(*message.entries[i]);
break;
case USB_VOLUME:
......
......@@ -6,9 +6,9 @@
#define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_FILE_MANAGER_BROWSERTEST_BASE_H_
#include <map>
#include <memory>
#include <string>
#include "base/memory/linked_ptr.h"
#include "base/values.h"
#include "chrome/browser/chromeos/drive/drive_integration_service.h"
#include "chrome/browser/extensions/extension_apitest.h"
......@@ -77,8 +77,8 @@ class FileManagerBrowserTestBase : public ExtensionApiTest {
std::string* output);
std::unique_ptr<LocalTestVolume> local_volume_;
linked_ptr<DriveTestVolume> drive_volume_;
std::map<Profile*, linked_ptr<DriveTestVolume>> drive_volumes_;
std::unique_ptr<DriveTestVolume> drive_volume_;
std::map<Profile*, std::unique_ptr<DriveTestVolume>> drive_volumes_;
std::unique_ptr<FakeTestVolume> usb_volume_;
std::unique_ptr<FakeTestVolume> mtp_volume_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment