[dom_distiller] Add support for incremental viewer.

components/dom_distiller/core/distiller.cc

 // Copyright 2013 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/core/distiller.h"
 
 #include <map>
 #include <vector>
 
 #include "base/auto_reset.h"
@@ skipping 123 matching lines @@
     scoped_ptr<DistilledPageInfo> distilled_page,
     bool distillation_successful) {
   DCHECK(distilled_page.get());
   DCHECK(started_pages_index_.find(page_num) != started_pages_index_.end());
   if (distillation_successful) {
     DistilledPageData* page_data =
         GetPageAtIndex(started_pages_index_[page_num]);
     page_data->distilled_page_proto =
         new base::RefCountedData<DistilledPageProto>();
     page_data->page_num = page_num;
-    page_data->title = distilled_page->title;
-
+    page_data->distilled_page_proto->data.set_title(distilled_page->title);
     page_data->distilled_page_proto->data.set_url(page_url.spec());
     page_data->distilled_page_proto->data.set_html(distilled_page->html);
 
     GURL next_page_url(distilled_page->next_page_url);
     if (next_page_url.is_valid()) {
       // The pages should be in same origin.
       DCHECK_EQ(next_page_url.GetOrigin(), page_url.GetOrigin());
       AddToDistillationQueue(page_num + 1, next_page_url);
     }
 
@@ skipping 104 matching lines @@
     bool first_page = true;
     scoped_ptr<DistilledArticleProto> article_proto(
         new DistilledArticleProto());
     // Stitch the pages back into the article.
     for (std::map<int, size_t>::iterator it = finished_pages_index_.begin();
          it != finished_pages_index_.end();) {
       DistilledPageData* page_data = GetPageAtIndex(it->second);
       *(article_proto->add_pages()) = page_data->distilled_page_proto->data;
 
       if (first_page) {
-        article_proto->set_title(page_data->title);
+        article_proto->set_title(page_data->distilled_page_proto->data.title());
         first_page = false;
       }
 
       finished_pages_index_.erase(it++);
     }
 
     pages_.clear();
     DCHECK_LE(static_cast<size_t>(article_proto->pages_size()),
               max_pages_in_article_);
 
     DCHECK(pages_.empty());
     DCHECK(finished_pages_index_.empty());
 
     base::AutoReset<bool> dont_delete_this_in_callback(&destruction_allowed_,
                                                        false);
     finished_cb_.Run(article_proto.Pass());
     finished_cb_.Reset();
   }
 }
 
 }  // namespace dom_distiller