| Index: ios/web/public/test/http_server/http_server.h
|
| diff --git a/ios/web/public/test/http_server.h b/ios/web/public/test/http_server/http_server.h
|
| similarity index 92%
|
| rename from ios/web/public/test/http_server.h
|
| rename to ios/web/public/test/http_server/http_server.h
|
| index af51875f5a3aa60b11ce5532e0cf66d138c70347..e1a584f2cad85fe7d4a2bfb569a04cd6db6b5698 100644
|
| --- a/ios/web/public/test/http_server.h
|
| +++ b/ios/web/public/test/http_server/http_server.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef IOS_WEB_PUBLIC_TEST_HTTP_SERVER_H_
|
| -#define IOS_WEB_PUBLIC_TEST_HTTP_SERVER_H_
|
| +#ifndef IOS_WEB_PUBLIC_TEST_HTTP_SERVER_HTTP_SERVER_H_
|
| +#define IOS_WEB_PUBLIC_TEST_HTTP_SERVER_HTTP_SERVER_H_
|
|
|
| #include <memory>
|
| #include <vector>
|
| @@ -12,7 +12,7 @@
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/synchronization/lock.h"
|
| -#import "ios/web/public/test/response_providers/response_provider.h"
|
| +#import "ios/web/public/test/http_server/response_provider.h"
|
|
|
| @class GCDWebServer;
|
|
|
| @@ -24,14 +24,15 @@ namespace test {
|
| // ref counted container for a ResponseProvider.
|
| // This object exists for legacy reasons since a large part of the code base
|
| // still uses ResponseProviders that are not ref counted.
|
| -class RefCountedResponseProviderWrapper :
|
| - public base::RefCounted<RefCountedResponseProviderWrapper> {
|
| +class RefCountedResponseProviderWrapper
|
| + : public base::RefCounted<RefCountedResponseProviderWrapper> {
|
| public:
|
| // Main constructor.
|
| explicit RefCountedResponseProviderWrapper(
|
| std::unique_ptr<ResponseProvider> response_provider);
|
| // Returns the ResponseProvider that backs this object.
|
| ResponseProvider* GetResponseProvider() { return response_provider_.get(); }
|
| +
|
| private:
|
| friend class base::RefCounted<RefCountedResponseProviderWrapper>;
|
| // The ResponseProvider that backs this object.
|
| @@ -111,8 +112,7 @@ class HttpServer {
|
| // Note: No more than one reponse provider can handle the request.
|
| // Thread safe.
|
| scoped_refptr<RefCountedResponseProviderWrapper>
|
| - GetResponseProviderForRequest(
|
| - const web::ResponseProvider::Request& request);
|
| + GetResponseProviderForRequest(const web::ResponseProvider::Request& request);
|
|
|
| // Lock for serializing access to |provider_|.
|
| mutable base::Lock provider_list_lock_;
|
| @@ -130,5 +130,4 @@ class HttpServer {
|
| } // namespace test
|
| } // namspace web
|
|
|
| -#endif // IOS_WEB_PUBLIC_TEST_HTTP_SERVER_H_
|
| -
|
| +#endif // IOS_WEB_PUBLIC_TEST_HTTP_SERVER_HTTP_SERVER_H_
|
|
|