Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1069)

Unified Diff: chrome_frame/test/net/fake_external_tab.cc

Issue 7265009: Revert 90464 - Move app/win/* files to base/win/, ui/base/win and chrome/common/ directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/utility/chrome_content_utility_client.cc ('k') | chrome_frame/test/url_request_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/net/fake_external_tab.cc
===================================================================
--- chrome_frame/test/net/fake_external_tab.cc (revision 90470)
+++ chrome_frame/test/net/fake_external_tab.cc (working copy)
@@ -9,6 +9,7 @@
#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"
@@ -22,7 +23,6 @@
#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"
@@ -311,7 +311,7 @@
if (!ShouldLaunchBrowser())
return;
- base::win::ScopedCOMInitializer com;
+ app::win::ScopedCOMInitializer com;
chrome_frame_test::CloseAllIEWindows();
test_http_server_.reset(new test_server::SimpleWebServer(kTestServerPort));
@@ -333,7 +333,7 @@
void CFUrlRequestUnittestRunner::ShutDownHostBrowser() {
if (ShouldLaunchBrowser()) {
- base::win::ScopedCOMInitializer com;
+ app::win::ScopedCOMInitializer com;
chrome_frame_test::CloseAllIEWindows();
}
}
« no previous file with comments | « chrome/utility/chrome_content_utility_client.cc ('k') | chrome_frame/test/url_request_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698