diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-25 12:18:51 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-25 12:18:51 +0000 |
| commit | dcd5776135982012e99ea7b7030b3412f61235c7 (patch) | |
| tree | 2853a787d4c09e4a8417a0c74a312917a05dce08 /chrome_frame/test/url_request_test.cc | |
| parent | 05ba8b8dd541632486513221795d45e4fe71b47f (diff) | |
| download | chromium_src-dcd5776135982012e99ea7b7030b3412f61235c7.zip chromium_src-dcd5776135982012e99ea7b7030b3412f61235c7.tar.gz chromium_src-dcd5776135982012e99ea7b7030b3412f61235c7.tar.bz2 | |
Reland "Move app/win/* files to base/win/, ui/base/win and chrome/common/ directories."
The issue with the r90464 was that in the win shared build we build dlls and we
need BASE_API to export functions and symbols.
BUG=72317
TEST=None
TBR=rsesek@chromium.org,brettw@chromium.org
Review URL: http://codereview.chromium.org/7263009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/url_request_test.cc')
| -rw-r--r-- | chrome_frame/test/url_request_test.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome_frame/test/url_request_test.cc b/chrome_frame/test/url_request_test.cc index a4a32cd..ab90f47 100644 --- a/chrome_frame/test/url_request_test.cc +++ b/chrome_frame/test/url_request_test.cc @@ -5,15 +5,15 @@ #include <atlbase.h> #include <atlcom.h> -#include "app/win/scoped_com_initializer.h" +#include "base/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 @@ TEST(UrlmonUrlRequestTest, Simple1) { chrome_frame_test::GetTestDataFolder()); mock_server.ExpectAndServeAnyRequests(CFInvocation(CFInvocation::NONE)); - app::win::ScopedCOMInitializer init_com; + base::win::ScopedCOMInitializer init_com; CComObjectStackEx<UrlmonUrlRequest> request; request.AddRef(); @@ -123,7 +123,7 @@ TEST(UrlmonUrlRequestTest, Head) { test_server::SimpleResponse head_response("/head", ""); server.AddResponse(&head_response); - app::win::ScopedCOMInitializer init_com; + base::win::ScopedCOMInitializer init_com; CComObjectStackEx<UrlmonUrlRequest> request; request.AddRef(); @@ -160,7 +160,7 @@ TEST(UrlmonUrlRequestTest, Head) { TEST(UrlmonUrlRequestTest, UnreachableUrl) { MockUrlDelegate mock; chrome_frame_test::TimedMsgLoop loop; - app::win::ScopedCOMInitializer init_com; + base::win::ScopedCOMInitializer init_com; CComObjectStackEx<UrlmonUrlRequest> request; testing::StrictMock<MockWebServer> mock_server(1337, L"127.0.0.1", @@ -206,7 +206,7 @@ TEST(UrlmonUrlRequestTest, ZeroLengthResponse) { chrome_frame_test::GetTestDataFolder()); mock_server.ExpectAndServeAnyRequests(CFInvocation(CFInvocation::NONE)); - app::win::ScopedCOMInitializer init_com; + base::win::ScopedCOMInitializer init_com; CComObjectStackEx<UrlmonUrlRequest> request; request.AddRef(); |