[iOS] Upstream web_controller_provider_impl.{h,mm}.

ios/public/provider/web/web_controller_provider.h

Index: ios/public/provider/web/web_controller_provider.h
diff --git a/ios/public/provider/web/web_controller_provider.h b/ios/public/provider/web/web_controller_provider.h
index 764ed04bea7b806b1251f795ee60d9ce89afaf26..9dc67272946848db3f4aceed188d962c1c7dba7e 100644
--- a/ios/public/provider/web/web_controller_provider.h
+++ b/ios/public/provider/web/web_controller_provider.h
@@ -7,6 +7,10 @@
 
 #include <memory>
 
+// TODO(sdefresne): remove includes of web_controller_provider_factory.h and
+// web_state_observer.h once downstream code has been fixed to use the correct
+// includes.
+#include "ios/public/provider/web/web_controller_provider_factory.h"
 #include "ios/web/public/block_types.h"
 #include "ios/web/public/web_state/web_state_observer.h"
 #include "url/gurl.h"
@@ -54,17 +58,6 @@ class WebControllerProvider {
                             web::JavaScriptResultBlock completion);
 };
 
-class WebControllerProviderFactory {
- public:
-  WebControllerProviderFactory();
-  virtual ~WebControllerProviderFactory();
-
-  // Vends WebControllerProviders created using |browser_state|, passing
-  // ownership to callers.
-  virtual std::unique_ptr<WebControllerProvider> CreateWebControllerProvider(
-      web::BrowserState* browser_state);
-};
-
 }  // namespace ios
 
 #endif  // IOS_PUBLIC_PROVIDER_WEB_WEB_CONTROLLER_PROVIDER_H_