| Index: ios/public/test/test_chrome_provider_initializer.h
|
| diff --git a/ios/public/test/test_chrome_provider_initializer.h b/ios/public/test/test_chrome_provider_initializer.h
|
| index 48080e43c8c8eea341b263c588c61c0325f689ab..f25ce8f87b890493ffcc6ed4d29d039887967297 100644
|
| --- a/ios/public/test/test_chrome_provider_initializer.h
|
| +++ b/ios/public/test/test_chrome_provider_initializer.h
|
| @@ -1,31 +1,13 @@
|
| -// Copyright 2013 The Chromium Authors. All rights reserved.
|
| +// Copyright 2016 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| #ifndef IOS_PUBLIC_TEST_TEST_CHROME_PROVIDER_INITIALIZER_H_
|
| #define IOS_PUBLIC_TEST_TEST_CHROME_PROVIDER_INITIALIZER_H_
|
|
|
| -#include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| -
|
| -namespace ios {
|
| -
|
| -class TestChromeBrowserProvider;
|
| -
|
| -// Initializes various objects needed to run unit tests that use ios::
|
| -// objects. Currently this includes setting up the chrome browser provider as
|
| -// a |TestChromeBrowserProvider|.
|
| -class TestChromeProviderInitializer {
|
| - public:
|
| - TestChromeProviderInitializer();
|
| - virtual ~TestChromeProviderInitializer();
|
| -
|
| - private:
|
| - scoped_ptr<TestChromeBrowserProvider> chrome_browser_provider_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(TestChromeProviderInitializer);
|
| -};
|
| -
|
| -} // namespace ios
|
| +// This is a forwarding header to avoid breaking Chrome on iOS downstream
|
| +// during merge. The header will be removed once all downstream code has
|
| +// been ported to use the new path.
|
| +#include "ios/public/provider/chrome/browser/test_chrome_provider_initializer.h"
|
|
|
| #endif // IOS_PUBLIC_TEST_TEST_CHROME_PROVIDER_INITIALIZER_H_
|
|
|