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 "chrome/browser/extensions/bundle_installer.h" | 10 #include "chrome/browser/extensions/bundle_installer.h" |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 waiting_ = false; | 62 waiting_ = false; |
63 MessageLoopForUI::current()->Quit(); | 63 MessageLoopForUI::current()->Quit(); |
64 } | 64 } |
65 } | 65 } |
66 | 66 |
67 void Wait() { | 67 void Wait() { |
68 if (received_success_ || received_failure_) | 68 if (received_success_ || received_failure_) |
69 return; | 69 return; |
70 | 70 |
71 waiting_ = true; | 71 waiting_ = true; |
72 ui_test_utils::RunMessageLoop(); | 72 content::RunMessageLoop(); |
73 } | 73 } |
74 | 74 |
75 bool received_failure() const { return received_failure_; } | 75 bool received_failure() const { return received_failure_; } |
76 bool received_success() const { return received_success_; } | 76 bool received_success() const { return received_success_; } |
77 const std::string& id() const { return id_; } | 77 const std::string& id() const { return id_; } |
78 const std::string& error() const { return error_; } | 78 const std::string& error() const { return error_; } |
79 | 79 |
80 private: | 80 private: |
81 bool received_failure_; | 81 bool received_failure_; |
82 bool received_success_; | 82 bool received_success_; |
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
452 blacklist->UpdateGpuDataManager(); | 452 blacklist->UpdateGpuDataManager(); |
453 GpuFeatureType type = | 453 GpuFeatureType type = |
454 content::GpuDataManager::GetInstance()->GetGpuFeatureType(); | 454 content::GpuDataManager::GetInstance()->GetGpuFeatureType(); |
455 EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL); | 455 EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL); |
456 | 456 |
457 bool webgl_allowed = false; | 457 bool webgl_allowed = false; |
458 RunTest(webgl_allowed); | 458 RunTest(webgl_allowed); |
459 } | 459 } |
460 | 460 |
461 } // namespace extensions | 461 } // namespace extensions |
OLD | NEW |