Some C++11 cleanup of history types.

components/history/core/browser/history_types.cc

 // 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/history/core/browser/history_types.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "components/history/core/browser/page_usage_data.h"
 
 namespace history {
 
 // VisitRow --------------------------------------------------------------------
 
-VisitRow::VisitRow()
-    : visit_id(0),
-      url_id(0),
-      referring_visit(0),
-      transition(ui::PAGE_TRANSITION_LINK),
-      segment_id(0) {
-}
+VisitRow::VisitRow() {}
 
 VisitRow::VisitRow(URLID arg_url_id,
                    base::Time arg_visit_time,
                    VisitID arg_referring_visit,
                    ui::PageTransition arg_transition,
                    SegmentID arg_segment_id)
-    : visit_id(0),
-      url_id(arg_url_id),
+    : url_id(arg_url_id),
       visit_time(arg_visit_time),
       referring_visit(arg_referring_visit),
       transition(arg_transition),
-      segment_id(arg_segment_id) {
-}
+      segment_id(arg_segment_id) {}
 
 VisitRow::~VisitRow() {
 }
 
 // QueryResults ----------------------------------------------------------------
 
 QueryResults::QueryResults() : reached_beginning_(false) {
 }
 
 QueryResults::~QueryResults() {}
@@ skipping 45 matching lines @@
   std::set<GURL> urls_modified;
   for (size_t i = begin; i <= end; i++) {
     urls_modified.insert(results_[i]->url());
   }
 
   // Now just delete that range in the vector en masse (the STL ending is
   // exclusive, while ours is inclusive, hence the +1).
   results_.erase(results_.begin() + begin, results_.begin() + end + 1);
 
   // Delete the indicies referencing the deleted entries.
-  for (std::set<GURL>::const_iterator url = urls_modified.begin();
-       url != urls_modified.end(); ++url) {
-    URLToResultIndices::iterator found = url_to_results_.find(*url);
+  for (const auto& url : urls_modified) {
+    URLToResultIndices::iterator found = url_to_results_.find(url);
     if (found == url_to_results_.end()) {
       NOTREACHED();
       continue;
     }
 
     // Need a signed loop type since we do -- which may take us to -1.
     for (int match = 0; match < static_cast<int>(found->second->size());
          match++) {
       if (found->second[match] >= begin && found->second[match] <= end) {
         // Remove this referece from the list.
@@ skipping 32 matching lines @@
     for (size_t match = 0; match < i->second->size(); match++) {
       size_t match_index = i->second[match];
       if (match_index >= begin && match_index <= end)
         i->second[match] += delta;
     }
   }
 }
 
 // QueryOptions ----------------------------------------------------------------
 
-QueryOptions::QueryOptions()
-    : max_count(0),
-      duplicate_policy(QueryOptions::REMOVE_ALL_DUPLICATES),
-      matching_algorithm(query_parser::MatchingAlgorithm::DEFAULT) {}
+QueryOptions::QueryOptions() {}
 
 void QueryOptions::SetRecentDayRange(int days_ago) {
   end_time = base::Time::Now();
   begin_time = end_time - base::TimeDelta::FromDays(days_ago);
 }
 
 int64_t QueryOptions::EffectiveBeginTime() const {
   return begin_time.ToInternalValue();
 }
 
 int64_t QueryOptions::EffectiveEndTime() const {
   return end_time.is_null() ? std::numeric_limits<int64_t>::max()
                             : end_time.ToInternalValue();
 }
 
 int QueryOptions::EffectiveMaxCount() const {
   return max_count ? max_count : std::numeric_limits<int>::max();
 }
 
 // QueryURLResult -------------------------------------------------------------
 
-QueryURLResult::QueryURLResult() : success(false) {
-}
+QueryURLResult::QueryURLResult() {}
 
 QueryURLResult::~QueryURLResult() {
 }
 
 // MostVisitedURL --------------------------------------------------------------
 
 MostVisitedURL::MostVisitedURL() {}
 
 MostVisitedURL::MostVisitedURL(const GURL& url,
-                               const base::string16& title)
-    : url(url),
-      title(title) {
-}
-
-MostVisitedURL::MostVisitedURL(const GURL& url,
                                const base::string16& title,
-                               const base::Time& last_forced_time)
-    : url(url),
-      title(title),
-      last_forced_time(last_forced_time) {
-}
+                               base::Time last_forced_time)
+    : url(url), title(title), last_forced_time(last_forced_time) {}
 
 MostVisitedURL::MostVisitedURL(const MostVisitedURL& other) = default;
 
+// TODO(bug 706963) this should be implemented as "= default" when Android
+// toolchain is updated.
+MostVisitedURL::MostVisitedURL(MostVisitedURL&& other) noexcept
+    : url(std::move(other.url)),
+      title(std::move(other.title)),
+      last_forced_time(other.last_forced_time),
+      redirects(std::move(other.redirects)) {}
+
 MostVisitedURL::~MostVisitedURL() {}
 
+MostVisitedURL& MostVisitedURL::operator=(const MostVisitedURL&) = default;
+
 // FilteredURL -----------------------------------------------------------------
 
-FilteredURL::FilteredURL() : score(0.0) {}
+FilteredURL::FilteredURL() {}
 
 FilteredURL::FilteredURL(const PageUsageData& page_data)
     : url(page_data.GetURL()),
       title(page_data.GetTitle()),
       score(page_data.GetScore()) {
 }
 
+FilteredURL::FilteredURL(FilteredURL&& other) noexcept = default;
+
 FilteredURL::~FilteredURL() {}
 
 // FilteredURL::ExtendedInfo ---------------------------------------------------
 
-FilteredURL::ExtendedInfo::ExtendedInfo()
-    : total_visits(0),
-      visits(0),
-      duration_opened(0) {
-}
+FilteredURL::ExtendedInfo::ExtendedInfo() = default;
 
 // Images ---------------------------------------------------------------------
 
 Images::Images() {}
 
 Images::Images(const Images& other) = default;
 
 Images::~Images() {}
 
 // TopSitesDelta --------------------------------------------------------------
@@ skipping 53 matching lines @@
 ThumbnailMigration::~ThumbnailMigration() {}
 
 // MostVisitedThumbnails ------------------------------------------------------
 
 MostVisitedThumbnails::MostVisitedThumbnails() {}
 
 MostVisitedThumbnails::~MostVisitedThumbnails() {}
 
 // IconMapping ----------------------------------------------------------------
 
-IconMapping::IconMapping()
-    : mapping_id(0), icon_id(0), icon_type(favicon_base::INVALID_ICON) {}
+IconMapping::IconMapping() {}
+IconMapping::IconMapping(const IconMapping&) = default;
+IconMapping::IconMapping(IconMapping&&) noexcept = default;
 
 IconMapping::~IconMapping() {}
 
+IconMapping& IconMapping::operator=(const IconMapping&) = default;
+
 // FaviconBitmapIDSize ---------------------------------------------------------
 
-FaviconBitmapIDSize::FaviconBitmapIDSize()
-    : bitmap_id(0) {
-}
+FaviconBitmapIDSize::FaviconBitmapIDSize() {}
 
-FaviconBitmapIDSize::~FaviconBitmapIDSize() {
-}
+FaviconBitmapIDSize::~FaviconBitmapIDSize() {}
 
 // FaviconBitmap --------------------------------------------------------------
 
-FaviconBitmap::FaviconBitmap()
-    : bitmap_id(0),
-      icon_id(0) {
-}
+FaviconBitmap::FaviconBitmap() {}
 
 FaviconBitmap::FaviconBitmap(const FaviconBitmap& other) = default;
 
-FaviconBitmap::~FaviconBitmap() {
-}
+FaviconBitmap::~FaviconBitmap() {}
 
 // ExpireHistoryArgs ----------------------------------------------------------
 
 ExpireHistoryArgs::ExpireHistoryArgs() {
 }
 
 ExpireHistoryArgs::ExpireHistoryArgs(const ExpireHistoryArgs& other) = default;
 
 ExpireHistoryArgs::~ExpireHistoryArgs() {
 }
 
 void ExpireHistoryArgs::SetTimeRangeForOneDay(base::Time time) {
   begin_time = time.LocalMidnight();
 
   // Due to DST, leap seconds, etc., the next day at midnight may be more than
   // 24 hours away, so add 36 hours and round back down to midnight.
   end_time = (begin_time + base::TimeDelta::FromHours(36)).LocalMidnight();
 }
 
 }  // namespace history