| Index: ios/chrome/test/testing_application_context.h
|
| diff --git a/ios/chrome/test/testing_application_context.h b/ios/chrome/test/testing_application_context.h
|
| index be61a589d2d08122f6770531443ad580a0868149..3e21dc5d158c936dda8608240526b5a496c6ec97 100644
|
| --- a/ios/chrome/test/testing_application_context.h
|
| +++ b/ios/chrome/test/testing_application_context.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef IOS_CHROME_TEST_TESTING_APPLICATION_CONTEXT_H_
|
| #define IOS_CHROME_TEST_TESTING_APPLICATION_CONTEXT_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/threading/thread_checker.h"
|
| #include "ios/chrome/browser/application_context.h"
|
|
|
| @@ -56,7 +57,7 @@ class TestingApplicationContext : public ApplicationContext {
|
| std::string application_locale_;
|
| PrefService* local_state_;
|
| ios::ChromeBrowserStateManager* chrome_browser_state_manager_;
|
| - scoped_ptr<network_time::NetworkTimeTracker> network_time_tracker_;
|
| + std::unique_ptr<network_time::NetworkTimeTracker> network_time_tracker_;
|
| bool was_last_shutdown_clean_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TestingApplicationContext);
|
|
|