| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/cancelable_callback.h" | 6 #include "base/cancelable_callback.h" |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 438 public: | 438 public: |
| 439 explicit WorkerCreationObserver(WorkerData* worker_data) | 439 explicit WorkerCreationObserver(WorkerData* worker_data) |
| 440 : worker_data_(worker_data) { | 440 : worker_data_(worker_data) { |
| 441 } | 441 } |
| 442 | 442 |
| 443 private: | 443 private: |
| 444 virtual ~WorkerCreationObserver() {} | 444 virtual ~WorkerCreationObserver() {} |
| 445 | 445 |
| 446 virtual void WorkerCreated ( | 446 virtual void WorkerCreated ( |
| 447 const GURL& url, | 447 const GURL& url, |
| 448 const string16& name, | 448 const base::string16& name, |
| 449 int process_id, | 449 int process_id, |
| 450 int route_id) OVERRIDE { | 450 int route_id) OVERRIDE { |
| 451 worker_data_->worker_process_id = process_id; | 451 worker_data_->worker_process_id = process_id; |
| 452 worker_data_->worker_route_id = route_id; | 452 worker_data_->worker_route_id = route_id; |
| 453 WorkerService::GetInstance()->RemoveObserver(this); | 453 WorkerService::GetInstance()->RemoveObserver(this); |
| 454 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, | 454 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |
| 455 base::MessageLoop::QuitClosure()); | 455 base::MessageLoop::QuitClosure()); |
| 456 delete this; | 456 delete this; |
| 457 } | 457 } |
| 458 scoped_refptr<WorkerData> worker_data_; | 458 scoped_refptr<WorkerData> worker_data_; |
| (...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 979 #if defined(OS_WIN) && defined(USE_ASH) | 979 #if defined(OS_WIN) && defined(USE_ASH) |
| 980 // Disable this test in Metro+Ash for now (http://crbug.com/262796). | 980 // Disable this test in Metro+Ash for now (http://crbug.com/262796). |
| 981 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) | 981 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) |
| 982 return; | 982 return; |
| 983 #endif | 983 #endif |
| 984 | 984 |
| 985 ASSERT_TRUE(RunExtensionTest("target_list")) << message_; | 985 ASSERT_TRUE(RunExtensionTest("target_list")) << message_; |
| 986 } | 986 } |
| 987 | 987 |
| 988 } // namespace | 988 } // namespace |
| OLD | NEW |