Merge 151183 - Every VisitItem returned by chrome.history.getVisits has link transition

chrome/browser/history/history_extension_api.cc

 // Copyright (c) 2012 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 "chrome/browser/history/history_extension_api.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/json/json_writer.h"
@@ skipping 50 matching lines @@
 
 scoped_ptr<VisitItem> GetVisitItem(const history::VisitRow& row) {
   scoped_ptr<VisitItem> visit_item(new VisitItem());
 
   visit_item->id = base::Int64ToString(row.url_id);
   visit_item->visit_id = base::Int64ToString(row.visit_id);
   visit_item->visit_time.reset(
       new double(MilliSecondsFromTime(row.visit_time)));
   visit_item->referring_visit_id = base::Int64ToString(row.referring_visit);
 
-  const char* trans =
-      content::PageTransitionGetCoreTransitionString(row.transition);
-  DCHECK(trans) << "Invalid transition.";
-
   VisitItem::Transition transition = VisitItem::TRANSITION_LINK;
-  switch (row.transition) {
+  switch (row.transition & content::PAGE_TRANSITION_CORE_MASK) {
     case content::PAGE_TRANSITION_LINK:
       transition = VisitItem::TRANSITION_LINK;
       break;
     case content::PAGE_TRANSITION_TYPED:
       transition = VisitItem::TRANSITION_TYPED;
       break;
     case content::PAGE_TRANSITION_AUTO_BOOKMARK:
       transition = VisitItem::TRANSITION_AUTO_BOOKMARK;
       break;
     case content::PAGE_TRANSITION_AUTO_SUBFRAME:
@@ skipping 312 matching lines @@
       &cancelable_consumer_,
       base::Bind(&DeleteAllHistoryFunction::DeleteComplete,
                  base::Unretained(this)));
 
   return true;
 }
 
 void DeleteAllHistoryFunction::DeleteComplete() {
   SendAsyncResponse();
 }