Enable offline pages feature on trunk by default

components/offline_pages/offline_page_model.cc

 // 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.
 
 #include "components/offline_pages/offline_page_model.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 266 matching lines @@
   for (const auto& id_page_pair : offline_pages_)
     bookmark_ids.push_back(id_page_pair.first);
   DeletePagesByBookmarkId(
       bookmark_ids,
       base::Bind(&OfflinePageModel::OnRemoveAllFilesDoneForClearAll,
                  weak_ptr_factory_.GetWeakPtr(),
                  callback));
 }
 
 bool OfflinePageModel::HasOfflinePages() const {
-  DCHECK(is_loaded_);
+  // Since offline pages feature is enabled by default,
+  // NetErrorTabHelper::SetHasOfflinePages might call this before the model is
+  // fully loaded. To address this, we need to switch to asynchonous model
+  // (crbug.com/589526). But for now, we just bail out to work around the test
+  // issue.
+  if (!is_loaded_)
+    return false;
+
   // Check that at least one page is not marked for deletion. Because we have
   // pages marked for deletion, we cannot simply invert result of |empty()|.
   for (const auto& id_page_pair : offline_pages_) {
     if (!id_page_pair.second.IsMarkedForDeletion())
       return true;
   }
   return false;
 }
 
 const std::vector<OfflinePageItem> OfflinePageModel::GetAllPages() const {
@@ skipping 433 matching lines @@
 }
 
 void OfflinePageModel::CacheLoadedData(
     const std::vector<OfflinePageItem>& offline_pages) {
   offline_pages_.clear();
   for (const auto& offline_page : offline_pages)
     offline_pages_[offline_page.bookmark_id] = offline_page;
 }
 
 }  // namespace offline_pages