First part of PAGE_TRANSITION_START_PAGE cleanup.

chrome/browser/sync/glue/session_model_associator.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/sync/glue/session_model_associator.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 663 matching lines @@
         sync_pb::SyncEnums_PageTransition_AUTO_SUBFRAME);
       break;
     case content::PAGE_TRANSITION_MANUAL_SUBFRAME:
       tab_navigation->set_page_transition(
         sync_pb::SyncEnums_PageTransition_MANUAL_SUBFRAME);
       break;
     case content::PAGE_TRANSITION_GENERATED:
       tab_navigation->set_page_transition(
         sync_pb::SyncEnums_PageTransition_GENERATED);
       break;
-    case content::PAGE_TRANSITION_START_PAGE:
+    case content::PAGE_TRANSITION_AUTO_TOPLEVEL:
       tab_navigation->set_page_transition(
-        sync_pb::SyncEnums_PageTransition_START_PAGE);
+        sync_pb::SyncEnums_PageTransition_AUTO_TOPLEVEL);
       break;
     case content::PAGE_TRANSITION_FORM_SUBMIT:
       tab_navigation->set_page_transition(
         sync_pb::SyncEnums_PageTransition_FORM_SUBMIT);
       break;
     case content::PAGE_TRANSITION_RELOAD:
       tab_navigation->set_page_transition(
         sync_pb::SyncEnums_PageTransition_RELOAD);
       break;
     case content::PAGE_TRANSITION_KEYWORD:
@@ skipping 549 matching lines @@
         break;
       case sync_pb::SyncEnums_PageTransition_AUTO_SUBFRAME:
         transition = content::PAGE_TRANSITION_AUTO_SUBFRAME;
         break;
       case sync_pb::SyncEnums_PageTransition_MANUAL_SUBFRAME:
         transition = content::PAGE_TRANSITION_MANUAL_SUBFRAME;
         break;
       case sync_pb::SyncEnums_PageTransition_GENERATED:
         transition = content::PAGE_TRANSITION_GENERATED;
         break;
-      case sync_pb::SyncEnums_PageTransition_START_PAGE:
-        transition = content::PAGE_TRANSITION_START_PAGE;
+      case sync_pb::SyncEnums_PageTransition_AUTO_TOPLEVEL:
+        transition = content::PAGE_TRANSITION_AUTO_TOPLEVEL;
         break;
       case sync_pb::SyncEnums_PageTransition_FORM_SUBMIT:
         transition = content::PAGE_TRANSITION_FORM_SUBMIT;
         break;
       case sync_pb::SyncEnums_PageTransition_RELOAD:
         transition = content::PAGE_TRANSITION_RELOAD;
         break;
       case sync_pb::SyncEnums_PageTransition_KEYWORD:
         transition = content::PAGE_TRANSITION_KEYWORD;
         break;
@@ skipping 328 matching lines @@
 
 bool SessionModelAssociator::CryptoReadyIfNecessary() {
   // We only access the cryptographer while holding a transaction.
   syncer::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());
   const syncer::ModelTypeSet encrypted_types = trans.GetEncryptedTypes();
   return !encrypted_types.Has(SESSIONS) ||
          sync_service_->IsCryptographerReady(&trans);
 }
 
 }  // namespace browser_sync