Revert 90464 - Move app/win/* files to base/win/, ui/base/win and chrome/common/ directories.

chrome/browser/importer/importer_unittest.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 "build/build_config.h"
 
 #if defined(OS_WIN)
 // The order of these includes is important.
 #include <windows.h>
 #include <unknwn.h>
 #include <intshcut.h>
 #include <pstore.h>
 #include <shlguid.h>
 #include <urlhist.h>
 #endif
 
 #include <vector>
 
+#include "app/win/scoped_com_initializer.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "base/win/scoped_com_initializer.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/importer/importer_host.h"
 #include "chrome/browser/importer/importer_progress_observer.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 288 matching lines @@
   for (int i = 0; i < arraysize(items); ++i) {
     HRESULT res = pstore->WriteItem(0, type, subtype, items[i].name,
         items[i].data_size, reinterpret_cast<BYTE*>(items[i].data),
         NULL, 0, 0);
     ASSERT_TRUE(res == PST_E_OK);
   }
 }
 
 TEST_F(ImporterTest, IEImporter) {
   // Sets up a favorites folder.
-  base::win::ScopedCOMInitializer com_init;
+  app::win::ScopedCOMInitializer com_init;
   std::wstring path = temp_dir_.path().AppendASCII("Favorites").value();
   CreateDirectory(path.c_str(), NULL);
   CreateDirectory((path + L"\\SubFolder").c_str(), NULL);
   CreateDirectory((path + L"\\Links").c_str(), NULL);
   CreateDirectory((path + L"\\Links\\SubFolderOfLinks").c_str(), NULL);
   CreateDirectory((path + L"\\\x0061").c_str(), NULL);
   ASSERT_TRUE(CreateUrlFile(path + L"\\Google Home Page.url",
                             L"http://www.google.com/"));
   ASSERT_TRUE(CreateUrlFile(path + L"\\SubFolder\\Title.url",
                             L"http://www.link.com/"));
@@ skipping 533 matching lines @@
                         true);
 }
 
 TEST_F(ImporterTest, MAYBE(Firefox35Importer)) {
   bool import_search_engines = false;
   scoped_refptr<Firefox3Observer> observer(
       new Firefox3Observer(import_search_engines));
   Firefox3xImporterTest("firefox35_profile", observer.get(), observer.get(),
                         import_search_engines);
 }