Create distiller files for Reading List.

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/bind.h"
 #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/strings/utf_string_conversions.h"
+#include "base/threading/thread_task_runner_handle.h"

[gambard, 2016/12/27 13:56:57]

Not needed.

[Olivier, 2016/12/27 14:52:14]

Done.

 #include "base/values.h"
-#include "components/favicon/ios/web_favicon_driver.h"
 #include "ios/web/public/browser_state.h"
 #import "ios/web/public/navigation_manager.h"
 #import "ios/web/public/web_state/js/crw_js_injection_manager.h"
 #import "ios/web/public/web_state/js/crw_js_injection_receiver.h"
 #import "ios/web/public/web_state/web_state.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
@@ skipping 93 matching lines @@
   DCHECK(web_state);
   DCHECK(distiller_page_);
 }
 
 void DistillerWebStateObserver::PageLoaded(
     web::PageLoadCompletionStatus load_completion_status) {
   distiller_page_->OnLoadURLDone(load_completion_status);
 }
 
 void DistillerWebStateObserver::WebStateDestroyed() {
-  distiller_page_->web_state_ = nullptr;
+  distiller_page_->DetachWebState();
 }
 
 #pragma mark -
 
-DistillerPageIOS::DistillerPageIOS(
-    FaviconWebStateDispatcher* web_state_dispatcher)
-    : web_state_dispatcher_(web_state_dispatcher), weak_ptr_factory_(this) {}
-
-DistillerPageIOS::~DistillerPageIOS() {
-}
+DistillerPageIOS::DistillerPageIOS(web::BrowserState* browser_state)
+    : browser_state_(browser_state), weak_ptr_factory_(this) {}
 
 bool DistillerPageIOS::StringifyOutput() {
   return false;
 }
 
+DistillerPageIOS::~DistillerPageIOS() {}
+
+void DistillerPageIOS::AttachWebState(
+    std::unique_ptr<web::WebState> web_state) {
+  if (web_state_) {
+    DetachWebState();
+  }
+  web_state_ = std::move(web_state);
+  if (web_state_) {
+    web_state_observer_ =
+        base::MakeUnique<DistillerWebStateObserver>(web_state_.get(), this);
+  }
+}
+
+std::unique_ptr<web::WebState> DistillerPageIOS::DetachWebState() {
+  std::unique_ptr<web::WebState> old_web_state = std::move(web_state_);
+  web_state_observer_.reset();
+  web_state_.reset();
+  return old_web_state;
+}
+
 void DistillerPageIOS::DistillPageImpl(const GURL& url,
                                        const std::string& script) {
   if (!url.is_valid() || !script.length())
     return;
   url_ = url;
   script_ = script;
 
-  web_state_ = web_state_dispatcher_->RequestWebState();
-
   if (!web_state_) {
-    OnLoadURLDone(web::PageLoadCompletionStatus::FAILURE);
-    return;
+    const web::WebState::CreateParams web_state_create_params(browser_state_);
+    std::unique_ptr<web::WebState> web_state_unique =
+        web::WebState::Create(web_state_create_params);
+    AttachWebState(std::move(web_state_unique));

[gambard, 2016/12/27 13:56:57]

Nit: you can probably create it directly inside the function call.

[Olivier, 2016/12/27 14:52:14]

What do you mean?

   }
-
-  web_state_observer_ =
-      base::MakeUnique<DistillerWebStateObserver>(web_state_, this);
-
-  // The favicon driver needs to know which URL is currently fetched.
-  favicon::WebFaviconDriver* favicon_driver =
-      favicon::WebFaviconDriver::FromWebState(web_state_);
-  favicon_driver->FetchFavicon(url_);
-
   // Load page using WebState.
   web::NavigationManager::WebLoadParams params(url_);
   web_state_->SetWebUsageEnabled(true);
   web_state_->GetNavigationManager()->LoadURLWithParams(params);
   // GetView is needed because the view is not created (but needed) when
   // loading the page.
   web_state_->GetView();
 }
 
 void DistillerPageIOS::OnLoadURLDone(
     web::PageLoadCompletionStatus load_completion_status) {
   // Don't attempt to distill if the page load failed or if there is no
   // WebState.
   if (load_completion_status == web::PageLoadCompletionStatus::FAILURE ||
       !web_state_) {
     HandleJavaScriptResult(nil);
     return;
   }
-
-  // Inject the script.

[gambard, 2016/12/27 13:56:57]

Why removing the comment?

[Olivier, 2016/12/27 14:52:14]

Done.

   base::WeakPtr<DistillerPageIOS> weak_this = weak_ptr_factory_.GetWeakPtr();
-
   [[web_state_->GetJSInjectionReceiver()
       instanceOfClass:[CRWJSInjectionManager class]]
       executeJavaScript:base::SysUTF8ToNSString(script_)
       completionHandler:^(id result, NSError* error) {
         DistillerPageIOS* distiller_page = weak_this.get();
         if (distiller_page)
           distiller_page->HandleJavaScriptResult(result);
       }];
 }
 
 void DistillerPageIOS::HandleJavaScriptResult(id result) {
-  web_state_dispatcher_->ReturnWebState(web_state_);
-  web_state_ = nullptr;
   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