OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "webkit/tools/test_shell/simple_appcache_system.h" | 5 #include "webkit/tools/test_shell/simple_appcache_system.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
380 if (db_thread_.IsRunning()) { | 380 if (db_thread_.IsRunning()) { |
381 // We pump a task thru the db thread to ensure any tasks previously | 381 // We pump a task thru the db thread to ensure any tasks previously |
382 // scheduled on that thread have been performed prior to return. | 382 // scheduled on that thread have been performed prior to return. |
383 base::WaitableEvent event(false, false); | 383 base::WaitableEvent event(false, false); |
384 db_thread_.message_loop()->PostTask( | 384 db_thread_.message_loop()->PostTask( |
385 FROM_HERE, base::Bind(&SignalEvent, &event)); | 385 FROM_HERE, base::Bind(&SignalEvent, &event)); |
386 event.Wait(); | 386 event.Wait(); |
387 } | 387 } |
388 } | 388 } |
389 | 389 |
390 void SimpleAppCacheSystem::InitOnUIThread(const FilePath& cache_directory) { | 390 void SimpleAppCacheSystem::InitOnUIThread(const base::FilePath& cache_directory)
{ |
391 DCHECK(!ui_message_loop_); | 391 DCHECK(!ui_message_loop_); |
392 ui_message_loop_ = MessageLoop::current(); | 392 ui_message_loop_ = MessageLoop::current(); |
393 cache_directory_ = cache_directory; | 393 cache_directory_ = cache_directory; |
394 } | 394 } |
395 | 395 |
396 void SimpleAppCacheSystem::InitOnIOThread( | 396 void SimpleAppCacheSystem::InitOnIOThread( |
397 net::URLRequestContext* request_context) { | 397 net::URLRequestContext* request_context) { |
398 if (!is_initailized_on_ui_thread()) | 398 if (!is_initailized_on_ui_thread()) |
399 return; | 399 return; |
400 | 400 |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
454 } | 454 } |
455 | 455 |
456 void SimpleAppCacheSystem::GetExtraResponseBits( | 456 void SimpleAppCacheSystem::GetExtraResponseBits( |
457 net::URLRequest* request, int64* cache_id, GURL* manifest_url) { | 457 net::URLRequest* request, int64* cache_id, GURL* manifest_url) { |
458 if (is_initialized()) { | 458 if (is_initialized()) { |
459 DCHECK(is_io_thread()); | 459 DCHECK(is_io_thread()); |
460 AppCacheInterceptor::GetExtraResponseInfo( | 460 AppCacheInterceptor::GetExtraResponseInfo( |
461 request, cache_id, manifest_url); | 461 request, cache_id, manifest_url); |
462 } | 462 } |
463 } | 463 } |
OLD | NEW |