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

Side by Side Diff: chrome/browser/ui/webui/extensions/extension_settings_browsertest.h

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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_BROWSERTEST_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_BROWSERTEST_H_
6 #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_BROWSERTEST_H_ 6 #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_BROWSERTEST_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "chrome/browser/extensions/extension_test_notification_observer.h" 9 #include "chrome/browser/extensions/extension_test_notification_observer.h"
10 #include "chrome/common/extensions/features/feature_channel.h" 10 #include "chrome/common/extensions/features/feature_channel.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 53
54 // Shrinks the web contents view in order to ensure vertical overflow. 54 // Shrinks the web contents view in order to ensure vertical overflow.
55 void ShrinkWebContentsView(); 55 void ShrinkWebContentsView();
56 56
57 private: 57 private:
58 bool WaitForExtensionViewsToLoad(); 58 bool WaitForExtensionViewsToLoad();
59 const extensions::Extension* InstallUnpackedExtension( 59 const extensions::Extension* InstallUnpackedExtension(
60 const base::FilePath& path); 60 const base::FilePath& path);
61 const extensions::Extension* InstallExtension(const base::FilePath& path); 61 const extensions::Extension* InstallExtension(const base::FilePath& path);
62 62
63 scoped_ptr<ExtensionTestNotificationObserver> observer_; 63 std::unique_ptr<ExtensionTestNotificationObserver> observer_;
64 64
65 // The default profile to be used. 65 // The default profile to be used.
66 Profile* profile_; 66 Profile* profile_;
67 67
68 // Used to simulate managed extensions (by being registered as a provider). 68 // Used to simulate managed extensions (by being registered as a provider).
69 extensions::TestManagementPolicyProvider policy_provider_; 69 extensions::TestManagementPolicyProvider policy_provider_;
70 70
71 base::FilePath test_data_dir_; 71 base::FilePath test_data_dir_;
72 72
73 // Used to enable the error console. 73 // Used to enable the error console.
74 scoped_ptr<extensions::FeatureSwitch::ScopedOverride> error_console_override_; 74 std::unique_ptr<extensions::FeatureSwitch::ScopedOverride>
75 error_console_override_;
75 76
76 scoped_ptr<extensions::ScopedTestDialogAutoConfirm> uninstall_auto_confirm_; 77 std::unique_ptr<extensions::ScopedTestDialogAutoConfirm>
78 uninstall_auto_confirm_;
77 79
78 DISALLOW_COPY_AND_ASSIGN(ExtensionSettingsUIBrowserTest); 80 DISALLOW_COPY_AND_ASSIGN(ExtensionSettingsUIBrowserTest);
79 }; 81 };
80 82
81 #endif // CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_BROWSERTEST_H_ 83 #endif // CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_BROWSERTEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698