3 files changed, 4 insertions, 31 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc
index 3cbda04..b420d75 100644
--- a/chrome/browser/autocomplete/autocomplete_edit.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit.cc
@@ -4,34 +4,19 @@
 
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 
-#include <locale>
-
-// TODO(deanm): Cleanup these includes.
 #include "base/basictypes.h"
-#include "base/ref_counted.h"
-#include "base/scoped_clipboard_writer.h"
 #include "base/string_util.h"
-#include "chrome/app/chrome_dll_resource.h"
-#include "chrome/browser/autocomplete/autocomplete_accessibility.h"
+#include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
-#include "chrome/browser/autocomplete/autocomplete_popup_view_win.h"
 #include "chrome/browser/autocomplete/keyword_provider.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/command_updater.h"
-#include "chrome/browser/drag_utils.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/views/location_bar_view.h"
-#include "chrome/common/clipboard_service.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/common/os_exchange_data.h"
-#include "chrome/common/win_util.h"
+#include "googleurl/src/gurl.h"
 #include "googleurl/src/url_util.h"
-#include "grit/generated_resources.h"
 #include "skia/include/SkBitmap.h"
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -164,7 +149,7 @@ bool AutocompleteEditModel::GetURLForText(const std::wstring& text,
   if (type != AutocompleteInput::URL)
     return false;
     
-  *url = GURL(URLFixerUpper::FixupURL(text, std::wstring()));
+  *url = GURL(URLFixerUpper::FixupURL(WideToUTF8(text), std::string()));
   return true;
 }
 
diff --git a/chrome/browser/autocomplete/autocomplete_popup_model.cc b/chrome/browser/autocomplete/autocomplete_popup_model.cc
index f6a5ffb..ca77882 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_model.cc
+++ b/chrome/browser/autocomplete/autocomplete_popup_model.cc
@@ -4,24 +4,14 @@
 
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 
-// TODO(deanm): Clean up these includes, not going to fight it now.
-#include <cmath>
-
-#include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
-#include "chrome/browser/autocomplete/autocomplete_popup_view_win.h"
-#include "chrome/browser/browser_process.h"
+#include "chrome/browser/autocomplete/autocomplete_popup_view.h"
 #include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/browser/views/location_bar_view.h"
-#include "chrome/common/gfx/chrome_canvas.h"
-#include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/common/resource_bundle.h"
-#include "grit/theme_resources.h"
 #include "third_party/icu38/public/common/unicode/ubidi.h"
 
 AutocompletePopupModel::AutocompletePopupModel(
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index 2a62c54..7603aaa 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -671,8 +671,6 @@ if not env.Bit('windows'):
   input_files.Remove(
       'app_modal_dialog_queue.cc',
       'autocomplete/autocomplete_accessibility.cc',
-      'autocomplete/autocomplete_edit.cc',
-      'autocomplete/autocomplete_popup_model.cc',
       'autocomplete/autocomplete_popup_view_win.cc',
       'autocomplete/edit_drop_target.cc',
       'automation/ui_controls.cc',