Remove app/win/win_util.h,cc etc.

chrome/browser/importer/importer.cc

 // Copyright (c) 2011 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/importer/importer.h"
 
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ skipping 12 matching lines @@
 #include "chrome/common/notification_source.h"
 #include "gfx/codec/png_codec.h"
 #include "gfx/favicon_size.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "webkit/glue/image_decoder.h"
 
 // TODO(port): Port these files.
 #if defined(OS_WIN)
-#include "app/win/win_util.h"
 #include "chrome/browser/ui/views/importer_lock_view.h"
+#include "ui/base/message_box_win.h"
 #include "views/window/window.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/ui/cocoa/importer/importer_lock_dialog.h"
 #elif defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/ui/gtk/import_lock_dialog_gtk.h"
 #endif
 
 using webkit_glue::PasswordForm;
 
 // Importer.
@@ skipping 145 matching lines @@
   task_ = NewRunnableMethod(importer_, &Importer::StartImport,
       profile_info, items, bridge);
 
   CheckForFirefoxLock(profile_info, items, first_run);
 
 #if defined(OS_WIN)
   // For google toolbar import, we need the user to log in and store their GAIA
   // credentials.
   if (profile_info.browser_type == importer::GOOGLE_TOOLBAR5) {
     if (!toolbar_importer_utils::IsGoogleGAIACookieInstalled()) {
-      app::win::MessageBox(
+      ui::MessageBox(
           NULL,
           UTF16ToWide(l10n_util::GetStringUTF16(
               IDS_IMPORTER_GOOGLE_LOGIN_TEXT)).c_str(),
           L"",
           MB_OK | MB_TOPMOST);
 
       GURL url("https://www.google.com/accounts/ServiceLogin");
       BrowserList::GetLastActive()->AddSelectedTabWithURL(
           url, PageTransition::TYPED);
 
@@ skipping 376 matching lines @@
   template_url_vec.reserve(template_urls.size());
   std::vector<TemplateURL>::const_iterator iter;
   for (iter = template_urls.begin();
        iter != template_urls.end();
        ++iter) {
     template_url_vec.push_back(new TemplateURL(*iter));
   }
   bridge_->SetKeywords(template_url_vec, default_keyword_index,
                        unique_on_host_and_path);
 }