OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #include "ios/chrome/test/ios_chrome_unit_test_suite.h" | 5 #include "ios/chrome/test/ios_chrome_unit_test_suite.h" |
6 | 6 |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "ios/chrome/browser/browser_state/browser_state_keyed_service_factories
.h" | 8 #include "ios/chrome/browser/browser_state/browser_state_keyed_service_factories
.h" |
9 #include "ios/chrome/browser/chrome_paths.h" | 9 #include "ios/chrome/browser/chrome_paths.h" |
10 #include "ios/chrome/browser/chrome_url_constants.h" | 10 #include "ios/chrome/browser/chrome_url_constants.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 | 44 |
45 test_ios_chrome_provider_initializer_.reset(); | 45 test_ios_chrome_provider_initializer_.reset(); |
46 DCHECK(!ios::GetChromeBrowserProvider()); | 46 DCHECK(!ios::GetChromeBrowserProvider()); |
47 | 47 |
48 DCHECK_EQ(web::GetWebClient(), web_client_.get()); | 48 DCHECK_EQ(web::GetWebClient(), web_client_.get()); |
49 web::SetWebClient(nullptr); | 49 web::SetWebClient(nullptr); |
50 web_client_.reset(); | 50 web_client_.reset(); |
51 } | 51 } |
52 | 52 |
53 private: | 53 private: |
54 scoped_ptr<web::WebClient> web_client_; | 54 std::unique_ptr<web::WebClient> web_client_; |
55 scoped_ptr<ios::TestChromeProviderInitializer> | 55 std::unique_ptr<ios::TestChromeProviderInitializer> |
56 test_ios_chrome_provider_initializer_; | 56 test_ios_chrome_provider_initializer_; |
57 scoped_ptr<ApplicationContext> application_context_; | 57 std::unique_ptr<ApplicationContext> application_context_; |
58 DISALLOW_COPY_AND_ASSIGN(IOSChromeUnitTestSuiteInitializer); | 58 DISALLOW_COPY_AND_ASSIGN(IOSChromeUnitTestSuiteInitializer); |
59 }; | 59 }; |
60 | 60 |
61 } // namespace | 61 } // namespace |
62 | 62 |
63 IOSChromeUnitTestSuite::IOSChromeUnitTestSuite(int argc, char** argv) | 63 IOSChromeUnitTestSuite::IOSChromeUnitTestSuite(int argc, char** argv) |
64 : base::TestSuite(argc, argv) {} | 64 : base::TestSuite(argc, argv) {} |
65 | 65 |
66 IOSChromeUnitTestSuite::~IOSChromeUnitTestSuite() {} | 66 IOSChromeUnitTestSuite::~IOSChromeUnitTestSuite() {} |
67 | 67 |
(...skipping 12 matching lines...) Expand all Loading... |
80 // test is run so that the dependencies are correctly resolved. | 80 // test is run so that the dependencies are correctly resolved. |
81 EnsureBrowserStateKeyedServiceFactoriesBuilt(); | 81 EnsureBrowserStateKeyedServiceFactoriesBuilt(); |
82 | 82 |
83 ios::RegisterPathProvider(); | 83 ios::RegisterPathProvider(); |
84 ui::RegisterPathProvider(); | 84 ui::RegisterPathProvider(); |
85 | 85 |
86 url::AddStandardScheme(kChromeUIScheme, url::SCHEME_WITHOUT_PORT); | 86 url::AddStandardScheme(kChromeUIScheme, url::SCHEME_WITHOUT_PORT); |
87 | 87 |
88 base::TestSuite::Initialize(); | 88 base::TestSuite::Initialize(); |
89 } | 89 } |
OLD | NEW |