| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "chrome/browser/extensions/extension_apitest.h" | 5 #include "chrome/browser/extensions/extension_apitest.h" |
| 6 | 6 |
| 7 #include "base/string_util.h" |
| 7 #include "chrome/browser/browser.h" | 8 #include "chrome/browser/browser.h" |
| 8 #include "chrome/browser/extensions/extensions_service.h" | 9 #include "chrome/browser/extensions/extensions_service.h" |
| 9 #include "chrome/browser/profile.h" | 10 #include "chrome/browser/profile.h" |
| 10 #include "chrome/common/notification_registrar.h" | 11 #include "chrome/common/notification_registrar.h" |
| 11 #include "chrome/test/ui_test_utils.h" | 12 #include "chrome/test/ui_test_utils.h" |
| 12 | 13 |
| 13 ExtensionApiTest::ResultCatcher::ResultCatcher() { | 14 ExtensionApiTest::ResultCatcher::ResultCatcher() { |
| 14 registrar_.Add(this, NotificationType::EXTENSION_TEST_PASSED, | 15 registrar_.Add(this, NotificationType::EXTENSION_TEST_PASSED, |
| 15 NotificationService::AllSources()); | 16 NotificationService::AllSources()); |
| 16 registrar_.Add(this, NotificationType::EXTENSION_TEST_FAILED, | 17 registrar_.Add(this, NotificationType::EXTENSION_TEST_FAILED, |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 message_ = "extension pointer is NULL."; | 127 message_ = "extension pointer is NULL."; |
| 127 return NULL; | 128 return NULL; |
| 128 } | 129 } |
| 129 return extension; | 130 return extension; |
| 130 } | 131 } |
| 131 | 132 |
| 132 void ExtensionApiTest::SetUpCommandLine(CommandLine* command_line) { | 133 void ExtensionApiTest::SetUpCommandLine(CommandLine* command_line) { |
| 133 ExtensionBrowserTest::SetUpCommandLine(command_line); | 134 ExtensionBrowserTest::SetUpCommandLine(command_line); |
| 134 test_data_dir_ = test_data_dir_.AppendASCII("api_test"); | 135 test_data_dir_ = test_data_dir_.AppendASCII("api_test"); |
| 135 } | 136 } |
| OLD | NEW |