DO NOT COMMIT

components/dom_distiller/ios/distiller_page_ios.mm

 // Copyright 2014 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.
 
 #include "components/dom_distiller/ios/distiller_page_ios.h"
 
 #import <UIKit/UIKit.h>
 
 #include <utility>
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/values.h"
+#include "components/dom_distiller/ios/distiller_favicon_ios.h"
 #include "ios/public/provider/web/web_controller_provider.h"
 #include "ios/public/provider/web/web_controller_provider_factory.h"
 #include "ios/web/public/browser_state.h"
+#include "ios/web/public/favicon_url.h"
 
 namespace {
 
 // This is duplicated here from ios/web/web_state/ui/web_view_js_utils.mm in
 // order to handle numbers. The dom distiller proto expects integers and the
 // generated JSON deserializer does not accept doubles in the place of ints.
 // However WKWebView only returns "numbers." However, here the proto expects
 // integers and doubles, which is done by checking if the number has a fraction
 // or not; since this is a hacky method it's isolated to this file so as to
 // limit the risk of broken JS calls.
@@ skipping 88 matching lines @@
   DCHECK(distiller_page_);
 }
 
 void DistillerWebStateObserver::PageLoaded(
     web::PageLoadCompletionStatus load_completion_status) {
   distiller_page_->OnLoadURLDone(load_completion_status);
 }
 
 #pragma mark -
 
-DistillerPageIOS::DistillerPageIOS(web::BrowserState* browser_state)
-    : browser_state_(browser_state), weak_ptr_factory_(this) {
-}
+DistillerPageIOS::DistillerPageIOS(web::BrowserState* browser_state,
+                                   DistillerFaviconIOS* distiller_favicon)
+    : distiller_favicon_(distiller_favicon), weak_ptr_factory_(this) {}
 
 DistillerPageIOS::~DistillerPageIOS() {
 }
 
 bool DistillerPageIOS::StringifyOutput() {
   return false;
 }
 
 void DistillerPageIOS::DistillPageImpl(const GURL& url,
                                        const std::string& script) {
   if (!url.is_valid() || !script.length())
     return;
   url_ = url;
   script_ = script;
 
-  // Lazily create provider.
-  if (!provider_) {
-    if (ios::GetWebControllerProviderFactory()) {
-      provider_ =
-          ios::GetWebControllerProviderFactory()->CreateWebControllerProvider(
-              browser_state_);
-      web_state_observer_.reset(
-          new DistillerWebStateObserver(provider_->GetWebState(), this));
-    }
-  }
+  provider_ = distiller_favicon_->CreateProvider(url);
+
+  //   Lazily create provider.
+  //  if (!provider_) {
+  //    if (ios::GetWebControllerProviderFactory()) {
+  //      provider_ =
+  // ios::GetWebControllerProviderFactory()->CreateWebControllerProvider(
+  //    browser_state_);
+  //      web_state_observer_.reset(
+  //          new DistillerWebStateObserver(provider_->GetWebState(), this));
+  //    }
+  //  }
 
   // Load page using provider.
   if (provider_)
     provider_->LoadURL(url_);
   else
     OnLoadURLDone(web::PageLoadCompletionStatus::FAILURE);
 }
 
 void DistillerPageIOS::OnLoadURLDone(
     web::PageLoadCompletionStatus load_completion_status) {
   // Don't attempt to distill if the page load failed or if there is no
   // provider.
   if (load_completion_status == web::PageLoadCompletionStatus::FAILURE ||
       !provider_) {
     HandleJavaScriptResult(nil);
     return;
   }
 
   // Inject the script.
   base::WeakPtr<DistillerPageIOS> weak_this = weak_ptr_factory_.GetWeakPtr();
   provider_->InjectScript(script_, ^(id result, NSError* error) {
     DistillerPageIOS* distiller_page = weak_this.get();
-    if (distiller_page)
+
+    if (distiller_page) {
       distiller_page->HandleJavaScriptResult(result);
+
+      // Get the favicons.
+      //      provider_->InjectScript(favicon_script_, ^(id result, NSError*
+      //      error) {
+      //        DistillerPageIOS* distiller_page_favicon = weak_this.get();
+      //        if (distiller_page_favicon)
+      //          distiller_page_favicon->HandleFaviconResult(result);
+      //      });
+    }
   });
 }
 
 void DistillerPageIOS::HandleJavaScriptResult(id result) {
   std::unique_ptr<base::Value> resultValue = base::Value::CreateNullValue();
   if (result) {
     resultValue = ValueResultFromScriptResult(result);
   }
   OnDistillationDone(url_, resultValue.get());
 }
 
 std::unique_ptr<base::Value> DistillerPageIOS::ValueResultFromScriptResult(
     id wk_result) {
   return ::ValueResultFromScriptResult(wk_result,
                                        kMaximumParsingRecursionDepth);
 }
 }  // namespace dom_distiller