Linux: enable omni box ui test and automation proxy ui test.

Enable a lot of (already essentially working) automation code along the way.

Review URL: http://codereview.chromium.org/100278

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15258 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 23 insertions, 19 deletions

diff --git a/chrome/browser/automation/automation_autocomplete_edit_tracker.h b/chrome/browser/automation/automation_autocomplete_edit_tracker.h
index 46b8eae..5a7c8e4 100644
--- a/chrome/browser/automation/automation_autocomplete_edit_tracker.h
+++ b/chrome/browser/automation/automation_autocomplete_edit_tracker.h
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_AUTOMATION_AUTOMATION_AUTOCOMPLETE_EDIT_TRACKER_H__
-#define CHROME_BROWSER_AUTOMATION_AUTOMATION_AUTOCOMPLETE_EDIT_TRACKER_H__
+#ifndef CHROME_BROWSER_AUTOMATION_AUTOMATION_AUTOCOMPLETE_EDIT_TRACKER_H_
+#define CHROME_BROWSER_AUTOMATION_AUTOMATION_AUTOCOMPLETE_EDIT_TRACKER_H_
 
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/automation/automation_resource_tracker.h"
 
-class AutomationAutocompleteEditTracker:
+class AutomationAutocompleteEditTracker :
     public AutomationResourceTracker<AutocompleteEditView*> {
  public:
   explicit AutomationAutocompleteEditTracker(IPC::Message::Sender* automation)
-      : AutomationResourceTracker(automation) { }
+      : AutomationResourceTracker<AutocompleteEditView*>(automation) { }
 
   virtual ~AutomationAutocompleteEditTracker() {
     ClearAllMappings();
@@ -32,4 +32,4 @@ class AutomationAutocompleteEditTracker:
   }
 };
 
-#endif  // CHROME_BROWSER_AUTOMATION_AUTOMATION_AUTOCOMPLETE_EDIT_TRACKER_H__
+#endif  // CHROME_BROWSER_AUTOMATION_AUTOMATION_AUTOCOMPLETE_EDIT_TRACKER_H_
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 67dc491..ec2284f 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -22,6 +22,7 @@
 #include "chrome/browser/find_bar.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/find_notification_details.h"
+#include "chrome/browser/location_bar.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/ssl/ssl_manager.h"
 #include "chrome/browser/ssl/ssl_blocking_page.h"
@@ -45,10 +46,13 @@
 #include "chrome/browser/external_tab_container.h"
 #include "chrome/browser/login_prompt.h"
 #include "chrome/browser/printing/print_job.h"
+#endif  // defined(OS_WIN)
+
+#if defined(OS_WIN)
 #include "chrome/browser/views/bookmark_bar_view.h"
-#include "chrome/browser/views/location_bar_view.h"
+#include "chrome/views/widget/widget_win.h"
 #include "chrome/views/window/window.h"
-#endif  // defined(OS_WIN)
+#endif
 
 using base::Time;
 
@@ -783,10 +787,10 @@ AutomationProvider::AutomationProvider(Profile* profile)
   browser_tracker_.reset(new AutomationBrowserTracker(this));
   tab_tracker_.reset(new AutomationTabTracker(this));
   window_tracker_.reset(new AutomationWindowTracker(this));
-#if defined(OS_WIN)
-  // TODO(port): Enable as the trackers get ported.
   autocomplete_edit_tracker_.reset(
       new AutomationAutocompleteEditTracker(this));
+#if defined(OS_WIN)
+  // TODO(port): Enable as the trackers get ported.
   cwindow_tracker_.reset(new AutomationConstrainedWindowTracker(this));
   new_tab_ui_load_observer_.reset(new NewTabUILoadObserver(this));
 #endif  // defined(OS_WIN)
@@ -2192,8 +2196,7 @@ void AutomationProvider::GetWindowForBrowser(int browser_handle,
   }
 }
 
-#if defined(OS_WIN)
-// TODO(port): Remove windowsisms.
+#if defined(OS_WIN) || defined(OS_LINUX)
 void AutomationProvider::GetAutocompleteEditForBrowser(
     int browser_handle,
     bool* success,
@@ -2203,16 +2206,17 @@ void AutomationProvider::GetAutocompleteEditForBrowser(
 
   if (browser_tracker_->ContainsHandle(browser_handle)) {
     Browser* browser = browser_tracker_->GetResource(browser_handle);
-    BrowserWindowTesting* testing_interface =
-        browser->window()->GetBrowserWindowTesting();
-    LocationBarView* loc_bar_view = testing_interface->GetLocationBarView();
-    AutocompleteEditView* edit_view = loc_bar_view->location_entry();
+    LocationBar* loc_bar = browser->window()->GetLocationBar();
+    AutocompleteEditView* edit_view = loc_bar->location_entry();
     // Add() returns the existing handle for the resource if any.
     *autocomplete_edit_handle = autocomplete_edit_tracker_->Add(edit_view);
     *success = true;
   }
 }
+#endif  // defined(OS_WIN) || defined(OS_LINUX)
 
+#if defined(OS_WIN)
+// TODO(port): Remove windowsisms.
 void AutomationProvider::GetBrowserForWindow(int window_handle,
                                              bool* success,
                                              int* browser_handle) {
@@ -2536,7 +2540,7 @@ void AutomationProvider::SavePage(int tab_handle,
   *success = true;
 }
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
 // TODO(port): Enable these.
 void AutomationProvider::GetAutocompleteEditText(int autocomplete_edit_handle,
                                                  bool* success,
@@ -2612,7 +2616,7 @@ void AutomationProvider::OnMessageFromExternalHost(int handle,
     view_host->ForwardMessageFromExternalHost(message, origin, target);
   }
 }
-#endif  // defined(OS_WIN)
+#endif  // defined(OS_WIN) || defined(OS_LINUX)
 
 TabContents* AutomationProvider::GetTabContentsForHandle(
     int handle, NavigationController** tab) {
diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h
index 2849cd1..6a64b0c 100644
--- a/chrome/browser/automation/automation_provider.h
+++ b/chrome/browser/automation/automation_provider.h
@@ -16,6 +16,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "chrome/browser/automation/automation_autocomplete_edit_tracker.h"
 #include "chrome/browser/automation/automation_browser_tracker.h"
 #include "chrome/browser/automation/automation_tab_tracker.h"
 #include "chrome/browser/automation/automation_window_tracker.h"
@@ -30,7 +31,6 @@
 
 #if defined(OS_WIN)
 // TODO(port): enable these.
-#include "chrome/browser/automation/automation_autocomplete_edit_tracker.h"
 #include "chrome/browser/automation/automation_constrained_window_tracker.h"
 enum AutomationMsg_NavigationResponseValues;
 #endif
@@ -459,8 +459,8 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>,
 #if defined(OS_WIN)
   // TODO(port): Enable as trackers get ported.
   scoped_ptr<AutomationConstrainedWindowTracker> cwindow_tracker_;
-  scoped_ptr<AutomationAutocompleteEditTracker> autocomplete_edit_tracker_;
 #endif
+  scoped_ptr<AutomationAutocompleteEditTracker> autocomplete_edit_tracker_;
   scoped_ptr<NavigationControllerRestoredObserver> restore_tracker_;
   LoginHandlerMap login_handler_map_;
   NotificationObserverList notification_observer_list_;