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

chrome_frame/test/net/fake_external_tab.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_frame/test/net/fake_external_tab.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <exdisp.h>
 
 #include "app/app_paths.h"
+#include "app/win/scoped_com_initializer.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/i18n/icu_util.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
-#include "base/win/scoped_com_initializer.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_handle.h"
 #include "chrome/browser/automation/automation_provider_list.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
 #include "chrome/browser/process_singleton.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/renderer_host/web_cache_manager.h"
@@ skipping 268 matching lines @@
 }
 
 CFUrlRequestUnittestRunner::~CFUrlRequestUnittestRunner() {
   fake_chrome_.Shutdown();
 }
 
 void CFUrlRequestUnittestRunner::StartChromeFrameInHostBrowser() {
   if (!ShouldLaunchBrowser())
     return;
 
-  base::win::ScopedCOMInitializer com;
+  app::win::ScopedCOMInitializer com;
   chrome_frame_test::CloseAllIEWindows();
 
   test_http_server_.reset(new test_server::SimpleWebServer(kTestServerPort));
   test_http_server_->AddResponse(&chrome_frame_html_);
   std::wstring url(base::StringPrintf(L"http://localhost:%i/chrome_frame",
                                       kTestServerPort).c_str());
 
   // Launch IE.  This launches IE correctly on Vista too.
   base::win::ScopedHandle ie_process(chrome_frame_test::LaunchIE(url));
   EXPECT_TRUE(ie_process.IsValid());
 
   // NOTE: If you're running IE8 and CF is not being loaded, you need to
   // disable IE8's prebinding until CF properly handles that situation.
   //
   // HKCU\Software\Microsoft\Internet Explorer\Main
   // Value name: EnablePreBinding (REG_DWORD)
   // Value: 0
 }
 
 void CFUrlRequestUnittestRunner::ShutDownHostBrowser() {
   if (ShouldLaunchBrowser()) {
-    base::win::ScopedCOMInitializer com;
+    app::win::ScopedCOMInitializer com;
     chrome_frame_test::CloseAllIEWindows();
   }
 }
 
 // Override virtual void Initialize to not call icu initialize
 void CFUrlRequestUnittestRunner::Initialize() {
   DCHECK(::GetCurrentThreadId() == test_thread_id_);
 
   // Start by replicating some of the steps that would otherwise be
   // done by TestSuite::Initialize.  We can't call the base class
@@ skipping 224 matching lines @@
   FilterDisabledTests();
   test_suite.RunMainUIThread();
 
   if (crash_service)
     base::KillProcess(crash_service, 0, false);
 
   base::KillProcesses(chrome_frame_test::kIEImageName, 0, NULL);
   base::KillProcesses(chrome_frame_test::kIEBrokerImageName, 0, NULL);
   return test_suite.test_result();
 }