Move ReadingList model to components/reading_list/core

components/reading_list/core/reading_list_entry.cc

 // Copyright 2016 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/reading_list/ios/reading_list_entry.h"
+#include "components/reading_list/core/reading_list_entry.h"
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/memory/ptr_util.h"
-#include "components/reading_list/ios/offline_url_utils.h"
-#include "components/reading_list/ios/proto/reading_list.pb.h"
-#include "components/reading_list/ios/reading_list_store.h"
+#include "components/reading_list/core/offline_url_utils.h"
+#include "components/reading_list/core/proto/reading_list.pb.h"
+#include "components/reading_list/core/reading_list_store.h"
 #include "components/sync/protocol/reading_list_specifics.pb.h"
 #include "net/base/backoff_entry_serializer.h"
 
 namespace {
 // Converts |time| to the number of microseconds since Jan 1st 1970.
 int64_t TimeToUS(const base::Time& time) {
   return (time - base::Time::UnixEpoch()).InMicroseconds();
 }
 }
 
@@ skipping 207 matching lines @@
   distillation_size_ = distilation_size;
   backoff_->Reset();
   failed_download_counter_ = 0;
 }
 
 void ReadingListEntry::SetDistilledState(DistillationState distilled_state) {
   DCHECK(distilled_state != PROCESSED);  // use SetDistilledPath instead.
   DCHECK(distilled_state != WAITING);
   // Increase time until next retry exponentially if the state change from a
   // non-error state to an error state.
-  if ((distilled_state == WILL_RETRY || distilled_state == ERROR) &&
-      distilled_state_ != WILL_RETRY && distilled_state_ != ERROR) {
+  if ((distilled_state == WILL_RETRY ||
+       distilled_state == DISTILLATION_ERROR) &&
+      distilled_state_ != WILL_RETRY &&
+      distilled_state_ != DISTILLATION_ERROR) {
     backoff_->InformOfRequest(false);
     failed_download_counter_++;
   }
 
   distilled_state_ = distilled_state;
   distilled_path_ = base::FilePath();
   distilled_url_ = GURL::EmptyGURL();
 }
 
 int64_t ReadingListEntry::UpdateTime() const {
@@ skipping 78 matching lines @@
         break;
       case reading_list::ReadingListLocal::PROCESSING:
         distillation_state = ReadingListEntry::PROCESSING;
         break;
       case reading_list::ReadingListLocal::PROCESSED:
         distillation_state = ReadingListEntry::PROCESSED;
         break;
       case reading_list::ReadingListLocal::WILL_RETRY:
         distillation_state = ReadingListEntry::WILL_RETRY;
         break;
-      case reading_list::ReadingListLocal::ERROR:
-        distillation_state = ReadingListEntry::ERROR;
+      case reading_list::ReadingListLocal::DISTILLATION_ERROR:
+        distillation_state = ReadingListEntry::DISTILLATION_ERROR;
         break;
     }
   }
 
   base::FilePath distilled_path;
   if (pb_entry.has_distilled_path()) {
-    distilled_path = base::FilePath(pb_entry.distilled_path());
+    distilled_path = base::FilePath::FromUTF8Unsafe(pb_entry.distilled_path());
   }
 
   GURL distilled_url;
   if (pb_entry.has_distilled_url()) {
     distilled_url = GURL(pb_entry.distilled_url());
   }
 
   int64_t distillation_time_us = 0;
   if (pb_entry.has_distillation_time_us()) {
     distillation_time_us = pb_entry.distillation_time_us();
@@ skipping 156 matching lines @@
       pb_entry->set_status(reading_list::ReadingListLocal::READ);
       break;
     case UNREAD:
       pb_entry->set_status(reading_list::ReadingListLocal::UNREAD);
       break;
     case UNSEEN:
       pb_entry->set_status(reading_list::ReadingListLocal::UNSEEN);
       break;
   }
 
-  reading_list::ReadingListLocal::DistillationState distilation_state;
+  reading_list::ReadingListLocal::DistillationState distilation_state =
+      reading_list::ReadingListLocal::WAITING;
   switch (DistilledState()) {
     case ReadingListEntry::WAITING:
       distilation_state = reading_list::ReadingListLocal::WAITING;
       break;
     case ReadingListEntry::PROCESSING:
       distilation_state = reading_list::ReadingListLocal::PROCESSING;
       break;
     case ReadingListEntry::PROCESSED:
       distilation_state = reading_list::ReadingListLocal::PROCESSED;
       break;
     case ReadingListEntry::WILL_RETRY:
       distilation_state = reading_list::ReadingListLocal::WILL_RETRY;
       break;
-    case ReadingListEntry::ERROR:
-      distilation_state = reading_list::ReadingListLocal::ERROR;
+    case ReadingListEntry::DISTILLATION_ERROR:
+      distilation_state = reading_list::ReadingListLocal::DISTILLATION_ERROR;
       break;
   }
   pb_entry->set_distillation_state(distilation_state);
   if (!DistilledPath().empty()) {
-    pb_entry->set_distilled_path(DistilledPath().value());
+    pb_entry->set_distilled_path(DistilledPath().AsUTF8Unsafe());
   }
   if (DistilledURL().is_valid()) {
     pb_entry->set_distilled_url(DistilledURL().spec());
   }
   if (DistillationTime()) {
     pb_entry->set_distillation_time_us(DistillationTime());
   }
   if (DistillationSize()) {
     pb_entry->set_distillation_size(DistillationSize());
   }
@@ skipping 34 matching lines @@
     case UNREAD:
       pb_entry->set_status(sync_pb::ReadingListSpecifics::UNREAD);
       break;
     case UNSEEN:
       pb_entry->set_status(sync_pb::ReadingListSpecifics::UNSEEN);
       break;
   }
 
   return pb_entry;
 }