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

Side by Side Diff: chrome/browser/extensions/extension_browsertest.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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_EXTENSIONS_EXTENSION_BROWSERTEST_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSERTEST_H_
6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSERTEST_H_ 6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSERTEST_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 311
312 #if defined(OS_CHROMEOS) 312 #if defined(OS_CHROMEOS)
313 // True if the command line should be tweaked as if ChromeOS user is 313 // True if the command line should be tweaked as if ChromeOS user is
314 // already logged in. 314 // already logged in.
315 bool set_chromeos_user_; 315 bool set_chromeos_user_;
316 #endif 316 #endif
317 317
318 // test_data/extensions. 318 // test_data/extensions.
319 base::FilePath test_data_dir_; 319 base::FilePath test_data_dir_;
320 320
321 scoped_ptr<ExtensionTestNotificationObserver> observer_; 321 std::unique_ptr<ExtensionTestNotificationObserver> observer_;
322 322
323 private: 323 private:
324 // Temporary directory for testing. 324 // Temporary directory for testing.
325 base::ScopedTempDir temp_dir_; 325 base::ScopedTempDir temp_dir_;
326 326
327 // Specifies the type of UI (if any) to show during installation and what 327 // Specifies the type of UI (if any) to show during installation and what
328 // user action to simulate. 328 // user action to simulate.
329 enum InstallUIType { 329 enum InstallUIType {
330 INSTALL_UI_TYPE_NONE, 330 INSTALL_UI_TYPE_NONE,
331 INSTALL_UI_TYPE_CANCEL, 331 INSTALL_UI_TYPE_CANCEL,
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 base::ScopedPathOverride common_desktop_override_; 374 base::ScopedPathOverride common_desktop_override_;
375 base::ScopedPathOverride user_quick_launch_override_; 375 base::ScopedPathOverride user_quick_launch_override_;
376 base::ScopedPathOverride start_menu_override_; 376 base::ScopedPathOverride start_menu_override_;
377 base::ScopedPathOverride common_start_menu_override_; 377 base::ScopedPathOverride common_start_menu_override_;
378 #endif 378 #endif
379 379
380 // The default profile to be used. 380 // The default profile to be used.
381 Profile* profile_; 381 Profile* profile_;
382 382
383 // Cache cache implementation. 383 // Cache cache implementation.
384 scoped_ptr<extensions::ExtensionCacheFake> test_extension_cache_; 384 std::unique_ptr<extensions::ExtensionCacheFake> test_extension_cache_;
385 }; 385 };
386 386
387 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSERTEST_H_ 387 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSERTEST_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_assets_manager_chromeos.cc ('k') | chrome/browser/extensions/extension_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698