| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <atlbase.h> | 5 #include <atlbase.h> |
| 6 #include <atlcom.h> | 6 #include <atlcom.h> |
| 7 | 7 |
| 8 #include "base/scoped_comptr_win.h" | 8 #include "base/scoped_comptr_win.h" |
| 9 #include "base/thread.h" | 9 #include "base/thread.h" |
| 10 #include "chrome_frame/bho.h" | 10 #include "chrome_frame/bho.h" |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 241 test.loop().RunFor(kUrlmonMonikerTimeoutSec); | 241 test.loop().RunFor(kUrlmonMonikerTimeoutSec); |
| 242 | 242 |
| 243 IBindCtx* release = bind_ctx.Detach(); | 243 IBindCtx* release = bind_ctx.Detach(); |
| 244 EXPECT_EQ(0, release->Release()); | 244 EXPECT_EQ(0, release->Release()); |
| 245 | 245 |
| 246 EXPECT_FALSE(test.nav_manager().HasRequestData()); | 246 EXPECT_FALSE(test.nav_manager().HasRequestData()); |
| 247 } | 247 } |
| 248 | 248 |
| 249 // Downloads a document asynchronously and then verifies that the downloaded | 249 // Downloads a document asynchronously and then verifies that the downloaded |
| 250 // contents were cached and the cache contents are correct. | 250 // contents were cached and the cache contents are correct. |
| 251 TEST_F(UrlmonMonikerTest, BindToStorageSwitchContent) { | 251 // TODO(tommi): Fix and re-enable. |
| 252 // http://code.google.com/p/chromium/issues/detail?id=39415 |
| 253 TEST_F(UrlmonMonikerTest, DISABLED_BindToStorageSwitchContent) { |
| 252 const wchar_t test_url[] = L"http://localhost:43210/"; | 254 const wchar_t test_url[] = L"http://localhost:43210/"; |
| 253 UrlmonMonikerTestManager test(test_url); | 255 UrlmonMonikerTestManager test(test_url); |
| 254 UrlmonMonikerTestCallback callback(&test); | 256 UrlmonMonikerTestCallback callback(&test); |
| 255 | 257 |
| 256 test_server::SimpleWebServer server(43210); | 258 test_server::SimpleWebServer server(43210); |
| 257 test_server::SimpleResponse default_response("/", kTestContent); | 259 test_server::SimpleResponse default_response("/", kTestContent); |
| 258 server.AddResponse(&default_response); | 260 server.AddResponse(&default_response); |
| 259 | 261 |
| 260 callback.SetCallbackExpectations( | 262 callback.SetCallbackExpectations( |
| 261 UrlmonMonikerTestCallback::REQUEST_ASYNCHRONOUS, INET_E_TERMINATED_BIND, | 263 UrlmonMonikerTestCallback::REQUEST_ASYNCHRONOUS, INET_E_TERMINATED_BIND, |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 UrlmonMonikerTestCallback callback2(&test); | 320 UrlmonMonikerTestCallback callback2(&test); |
| 319 callback2.SetCallbackExpectations( | 321 callback2.SetCallbackExpectations( |
| 320 UrlmonMonikerTestCallback::EXPECT_NO_CALL, S_OK, false); | 322 UrlmonMonikerTestCallback::EXPECT_NO_CALL, S_OK, false); |
| 321 hr = callback2.CreateUrlMonikerAndBindToStorage(test_url, NULL); | 323 hr = callback2.CreateUrlMonikerAndBindToStorage(test_url, NULL); |
| 322 // S_OK means that the operation completed synchronously. | 324 // S_OK means that the operation completed synchronously. |
| 323 // Otherwise we'd get MK_S_ASYNCHRONOUS. | 325 // Otherwise we'd get MK_S_ASYNCHRONOUS. |
| 324 EXPECT_EQ(S_OK, hr); | 326 EXPECT_EQ(S_OK, hr); |
| 325 } | 327 } |
| 326 } | 328 } |
| 327 | 329 |
| OLD | NEW |