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

ios/public/provider/web/web_controller_provider.h

 // Copyright 2015 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_PROVIDER_WEB_WEB_CONTROLLER_PROVIDER_H_
 #define IOS_PUBLIC_PROVIDER_WEB_WEB_CONTROLLER_PROVIDER_H_
 
 #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"
 
 namespace web {
 class BrowserState;
 class WebState;
 }
 
 namespace ios {
@@ skipping 27 matching lines @@
   // Returns the WebState associated with this web controller.
   virtual web::WebState* GetWebState() const;
 
   // Injects |script| into the previously loaded page, if any, and calls
   // |completion| with the result.  Calls |completion| with nil parameters
   // when there is no previously loaded page.
   virtual void InjectScript(const std::string& script,
                             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_