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

Unified Diff: chrome_frame/test/url_request_test.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_frame/test/net/fake_external_tab.cc ('k') | content/browser/geolocation/win7_location_api_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/url_request_test.cc
===================================================================
--- chrome_frame/test/url_request_test.cc (revision 90470)
+++ chrome_frame/test/url_request_test.cc (working copy)
@@ -5,15 +5,15 @@
#include <atlbase.h>
#include <atlcom.h>
-#include "base/win/scoped_com_initializer.h"
+#include "app/win/scoped_com_initializer.h"
#include "chrome/common/automation_messages.h"
#include "chrome_frame/test/chrome_frame_test_utils.h"
#include "chrome_frame/test/test_server.h"
#include "chrome_frame/test/test_with_web_server.h"
#include "chrome_frame/urlmon_url_request.h"
#include "chrome_frame/urlmon_url_request_private.h"
+#include "testing/gmock_mutant.h"
#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gmock_mutant.h"
#include "testing/gtest/include/gtest/gtest.h"
using testing::CreateFunctor;
@@ -74,7 +74,7 @@
chrome_frame_test::GetTestDataFolder());
mock_server.ExpectAndServeAnyRequests(CFInvocation(CFInvocation::NONE));
- base::win::ScopedCOMInitializer init_com;
+ app::win::ScopedCOMInitializer init_com;
CComObjectStackEx<UrlmonUrlRequest> request;
request.AddRef();
@@ -123,7 +123,7 @@
test_server::SimpleResponse head_response("/head", "");
server.AddResponse(&head_response);
- base::win::ScopedCOMInitializer init_com;
+ app::win::ScopedCOMInitializer init_com;
CComObjectStackEx<UrlmonUrlRequest> request;
request.AddRef();
@@ -160,7 +160,7 @@
TEST(UrlmonUrlRequestTest, UnreachableUrl) {
MockUrlDelegate mock;
chrome_frame_test::TimedMsgLoop loop;
- base::win::ScopedCOMInitializer init_com;
+ app::win::ScopedCOMInitializer init_com;
CComObjectStackEx<UrlmonUrlRequest> request;
testing::StrictMock<MockWebServer> mock_server(1337, L"127.0.0.1",
@@ -206,7 +206,7 @@
chrome_frame_test::GetTestDataFolder());
mock_server.ExpectAndServeAnyRequests(CFInvocation(CFInvocation::NONE));
- base::win::ScopedCOMInitializer init_com;
+ app::win::ScopedCOMInitializer init_com;
CComObjectStackEx<UrlmonUrlRequest> request;
request.AddRef();
« no previous file with comments | « chrome_frame/test/net/fake_external_tab.cc ('k') | content/browser/geolocation/win7_location_api_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698