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 <vector> | 5 #include <vector> |
6 | 6 |
7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/stringprintf.h" | 9 #include "base/stringprintf.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 received_success_ = true; | 49 received_success_ = true; |
50 id_ = id; | 50 id_ = id; |
51 | 51 |
52 if (waiting_) { | 52 if (waiting_) { |
53 waiting_ = false; | 53 waiting_ = false; |
54 MessageLoopForUI::current()->Quit(); | 54 MessageLoopForUI::current()->Quit(); |
55 } | 55 } |
56 } | 56 } |
57 | 57 |
58 void OnExtensionInstallFailure(const std::string& id, | 58 void OnExtensionInstallFailure(const std::string& id, |
59 const std::string& error) OVERRIDE { | 59 const std::string& error, |
| 60 bool cancelled) OVERRIDE { |
60 received_failure_ = true; | 61 received_failure_ = true; |
61 id_ = id; | 62 id_ = id; |
62 error_ = error; | 63 error_ = error; |
63 | 64 |
64 if (waiting_) { | 65 if (waiting_) { |
65 waiting_ = false; | 66 waiting_ = false; |
66 MessageLoopForUI::current()->Quit(); | 67 MessageLoopForUI::current()->Quit(); |
67 } | 68 } |
68 } | 69 } |
69 | 70 |
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
454 GpuFeatureType type = | 455 GpuFeatureType type = |
455 content::GpuDataManager::GetInstance()->GetBlacklistedFeatures(); | 456 content::GpuDataManager::GetInstance()->GetBlacklistedFeatures(); |
456 EXPECT_EQ((type & content::GPU_FEATURE_TYPE_WEBGL), | 457 EXPECT_EQ((type & content::GPU_FEATURE_TYPE_WEBGL), |
457 content::GPU_FEATURE_TYPE_WEBGL); | 458 content::GPU_FEATURE_TYPE_WEBGL); |
458 | 459 |
459 bool webgl_allowed = false; | 460 bool webgl_allowed = false; |
460 RunTest(webgl_allowed); | 461 RunTest(webgl_allowed); |
461 } | 462 } |
462 | 463 |
463 } // namespace extensions | 464 } // namespace extensions |
OLD | NEW |