| OLD | NEW |
| 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 CONTENT_PUBLIC_TEST_TEST_BROWSER_THREAD_H_ | 5 #ifndef CONTENT_PUBLIC_TEST_TEST_BROWSER_THREAD_H_ |
| 6 #define CONTENT_PUBLIC_TEST_TEST_BROWSER_THREAD_H_ | 6 #define CONTENT_PUBLIC_TEST_TEST_BROWSER_THREAD_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 9 |
| 8 #include "base/macros.h" | 10 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | |
| 10 #include "content/public/browser/browser_thread.h" | 11 #include "content/public/browser/browser_thread.h" |
| 11 | 12 |
| 12 namespace base { | 13 namespace base { |
| 13 class MessageLoop; | 14 class MessageLoop; |
| 14 class Thread; | 15 class Thread; |
| 15 } | 16 } |
| 16 | 17 |
| 17 namespace content { | 18 namespace content { |
| 18 | 19 |
| 19 class TestBrowserThreadImpl; | 20 class TestBrowserThreadImpl; |
| (...skipping 27 matching lines...) Expand all Loading... |
| 47 void Stop(); | 48 void Stop(); |
| 48 | 49 |
| 49 // Returns true if the thread is running. | 50 // Returns true if the thread is running. |
| 50 bool IsRunning(); | 51 bool IsRunning(); |
| 51 | 52 |
| 52 // Returns a Thread pointer for the thread. This should not be used | 53 // Returns a Thread pointer for the thread. This should not be used |
| 53 // in new tests. | 54 // in new tests. |
| 54 base::Thread* DeprecatedGetThreadObject(); | 55 base::Thread* DeprecatedGetThreadObject(); |
| 55 | 56 |
| 56 private: | 57 private: |
| 57 scoped_ptr<TestBrowserThreadImpl> impl_; | 58 std::unique_ptr<TestBrowserThreadImpl> impl_; |
| 58 | 59 |
| 59 DISALLOW_COPY_AND_ASSIGN(TestBrowserThread); | 60 DISALLOW_COPY_AND_ASSIGN(TestBrowserThread); |
| 60 }; | 61 }; |
| 61 | 62 |
| 62 } // namespace content | 63 } // namespace content |
| 63 | 64 |
| 64 #endif // CONTENT_PUBLIC_TEST_TEST_BROWSER_THREAD_H_ | 65 #endif // CONTENT_PUBLIC_TEST_TEST_BROWSER_THREAD_H_ |
| OLD | NEW |