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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 void OnExtensionInstallSuccess(const std::string& id) OVERRIDE { | 48 void OnExtensionInstallSuccess(const std::string& id) OVERRIDE { |
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( |
59 const std::string& error) OVERRIDE { | 59 const std::string& id, |
| 60 const std::string& error, |
| 61 WebstoreInstaller::FailureReason reason) OVERRIDE { |
60 received_failure_ = true; | 62 received_failure_ = true; |
61 id_ = id; | 63 id_ = id; |
62 error_ = error; | 64 error_ = error; |
63 | 65 |
64 if (waiting_) { | 66 if (waiting_) { |
65 waiting_ = false; | 67 waiting_ = false; |
66 MessageLoopForUI::current()->Quit(); | 68 MessageLoopForUI::current()->Quit(); |
67 } | 69 } |
68 } | 70 } |
69 | 71 |
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
470 GpuFeatureType type = | 472 GpuFeatureType type = |
471 content::GpuDataManager::GetInstance()->GetBlacklistedFeatures(); | 473 content::GpuDataManager::GetInstance()->GetBlacklistedFeatures(); |
472 EXPECT_EQ((type & content::GPU_FEATURE_TYPE_WEBGL), | 474 EXPECT_EQ((type & content::GPU_FEATURE_TYPE_WEBGL), |
473 content::GPU_FEATURE_TYPE_WEBGL); | 475 content::GPU_FEATURE_TYPE_WEBGL); |
474 | 476 |
475 bool webgl_allowed = false; | 477 bool webgl_allowed = false; |
476 RunTest(webgl_allowed); | 478 RunTest(webgl_allowed); |
477 } | 479 } |
478 | 480 |
479 } // namespace extensions | 481 } // namespace extensions |
OLD | NEW |