Revert "Refactor automation messages." due to mysterious problems on mac.

chrome/browser/tab_contents/navigation_controller.cc

 // Copyright (c) 2010 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/tab_contents/navigation_controller.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 700 matching lines @@
     // TODO(brettw) this assumes that the pending entry is appropriate for the
     // new page that was just loaded. I don't think this is necessarily the
     // case! We should have some more tracking to know for sure. This goes along
     // with a similar TODO at the top of RendererDidNavigate where we blindly
     // set the site instance on the pending entry.
     new_entry = new NavigationEntry(*pending_entry_);
 
     // Don't use the page type from the pending entry. Some interstitial page
     // may have set the type to interstitial. Once we commit, however, the page
     // type must always be normal.
-    new_entry->set_page_type(NORMAL_PAGE);
+    new_entry->set_page_type(NavigationEntry::NORMAL_PAGE);
   } else {
     new_entry = new NavigationEntry;
   }
 
   new_entry->set_url(params.url);
   if (new_entry->update_virtual_url_with_url())
     UpdateVirtualURLToURL(new_entry, params.url);
   new_entry->set_referrer(params.referrer);
   new_entry->set_page_id(params.page_id);
   new_entry->set_transition_type(params.transition);
@@ skipping 461 matching lines @@
   return entries_[transient_entry_index_].get();
 }
 
 void NavigationController::InsertEntriesFrom(
     const NavigationController& source,
     int max_index) {
   DCHECK_LE(max_index, source.entry_count());
   size_t insert_index = 0;
   for (int i = 0; i < max_index; i++) {
     // When cloning a tab, copy all entries except interstitial pages
-    if (source.entries_[i].get()->page_type() != INTERSTITIAL_PAGE) {
+    if (source.entries_[i].get()->page_type() !=
+        NavigationEntry::INTERSTITIAL_PAGE) {
       entries_.insert(entries_.begin() + insert_index++,
                       linked_ptr<NavigationEntry>(
                           new NavigationEntry(*source.entries_[i])));
     }
   }
 }