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

Unified Diff: chrome/browser/ui/location_bar/location_bar_browsertest.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 | « chrome/browser/ui/libgtk2ui/unity_service.cc ('k') | chrome/browser/ui/login/login_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/location_bar/location_bar_browsertest.cc
diff --git a/chrome/browser/ui/location_bar/location_bar_browsertest.cc b/chrome/browser/ui/location_bar/location_bar_browsertest.cc
index 9c2ce685512334f76ec9ec70857bd6f4ab5835bc..211c886de45298febc1fdfb7cab40e1cd17b95b7 100644
--- a/chrome/browser/ui/location_bar/location_bar_browsertest.cc
+++ b/chrome/browser/ui/location_bar/location_bar_browsertest.cc
@@ -2,8 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/browser/ui/location_bar/location_bar.h"
+
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
@@ -15,7 +18,6 @@
#include "chrome/browser/sessions/session_tab_helper.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/location_bar/location_bar.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "extensions/common/extension.h"
#include "extensions/common/extension_builder.h"
@@ -54,8 +56,8 @@ class LocationBarBrowserTest : public ExtensionBrowserTest {
extensions::TestExtensionDir* dir);
private:
- scoped_ptr<extensions::FeatureSwitch::ScopedOverride> enable_override_;
- scoped_ptr<extensions::FeatureSwitch::ScopedOverride> enable_redesign_;
+ std::unique_ptr<extensions::FeatureSwitch::ScopedOverride> enable_override_;
+ std::unique_ptr<extensions::FeatureSwitch::ScopedOverride> enable_redesign_;
DISALLOW_COPY_AND_ASSIGN(LocationBarBrowserTest);
};
@@ -174,7 +176,7 @@ class LocationBarBrowserTestWithRedesign : public LocationBarBrowserTest {
private:
void SetUpCommandLine(base::CommandLine* command_line) override;
- scoped_ptr<extensions::FeatureSwitch::ScopedOverride> enable_redesign_;
+ std::unique_ptr<extensions::FeatureSwitch::ScopedOverride> enable_redesign_;
DISALLOW_COPY_AND_ASSIGN(LocationBarBrowserTestWithRedesign);
};
« no previous file with comments | « chrome/browser/ui/libgtk2ui/unity_service.cc ('k') | chrome/browser/ui/login/login_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698