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

chrome/browser/automation/automation_provider_observers.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/automation/automation_provider_observers.h"
 
 #include <deque>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ skipping 17 matching lines @@
 #include "chrome/browser/metrics/metric_event_duration_details.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/balloon_collection.h"
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/translate/page_translated_details.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
-#include "chrome/common/automation_constants.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_service.h"
+#include "chrome/test/automation/automation_constants.h"
 #include "gfx/rect.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/authentication_notification_details.h"
 #endif
 
 // Holds onto start and stop timestamps for a particular tab
 class InitialLoadObserver::TabTime {
  public:
   explicit TabTime(base::TimeTicks started)
@@ skipping 1312 matching lines @@
       this, &OnNotificationBalloonCountObserver::OnBalloonCollectionChanged));
 }
 
 void OnNotificationBalloonCountObserver::OnBalloonCollectionChanged() {
   if (static_cast<int>(collection_->GetActiveBalloons().size()) == count_) {
     collection_->set_on_collection_changed_callback(NULL);
     reply_.SendSuccess(NULL);
     delete this;
   }
 }