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

chrome_frame/test/url_request_test.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 <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;
 
 const int kChromeFrameLongNavigationTimeoutInSeconds = 10;
 
 static void AppendToStream(IStream* s, void* buffer, ULONG cb) {
   ULONG bytes_written;
   LARGE_INTEGER current_pos;
   LARGE_INTEGER zero = {0};
@@ skipping 40 matching lines @@
 
 // Simplest UrlmonUrlRequest. Retrieve a file from local web server.
 TEST(UrlmonUrlRequestTest, Simple1) {
   MockUrlDelegate mock;
   chrome_frame_test::TimedMsgLoop loop;
 
   testing::StrictMock<MockWebServer> mock_server(1337, L"127.0.0.1",
       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();
   request.Initialize(&mock, 1,  // request_id
       WideToUTF8(mock_server.Resolve(L"chrome_frame_window_open.html")),
       "get",
       "",      // referrer
       "",      // extra request
       NULL,    // upload data
       ResourceType::MAIN_FRAME,  // resource type
@@ skipping 28 matching lines @@
 // from the server.
 TEST(UrlmonUrlRequestTest, Head) {
   MockUrlDelegate mock;
   chrome_frame_test::TimedMsgLoop loop;
   // Use SimpleWebServer instead of the python server to support HEAD
   // requests.
   test_server::SimpleWebServer server(13337);
   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();
   request.Initialize(&mock, 1,  // request_id
       "http://localhost:13337/head",
       "head",
       "",      // referrer
       "",      // extra request
       NULL,    // upload data
       ResourceType::MAIN_FRAME,  // resource type
@@ skipping 16 matching lines @@
     .WillOnce(QUIT_LOOP_SOON(loop, 2));
 
   request.Start();
   loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
   request.Release();
 }
 
 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",
       chrome_frame_test::GetTestDataFolder());
   mock_server.ExpectAndServeAnyRequests(CFInvocation(CFInvocation::NONE));
 
   GURL unreachable(WideToUTF8(mock_server.Resolve(
       L"non_existing.html")));
 
   request.AddRef();
@@ skipping 25 matching lines @@
 }
 
 TEST(UrlmonUrlRequestTest, ZeroLengthResponse) {
   MockUrlDelegate mock;
   chrome_frame_test::TimedMsgLoop loop;
 
   testing::StrictMock<MockWebServer> mock_server(1337, L"127.0.0.1",
       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();
   request.Initialize(&mock, 1,  // request_id
       WideToUTF8(mock_server.Resolve(L"empty.html")), "get",
       "",      // referrer
       "",      // extra request
       NULL,    // upload data
       ResourceType::MAIN_FRAME,  // resource type
       true,
@@ skipping 91 matching lines @@
   EXPECT_CALL(mock, OnReadComplete(1, testing::_))
     .Times(0);
 
   EXPECT_CALL(mock, OnResponseEnd(1, testing::_))
     .Times(0);
 
   mgr->StartUrlRequest(1, r1);
   loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
   mgr.reset();
 }