diff options
| author | yoz <yoz@chromium.org> | 2014-09-09 16:16:32 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-09 23:27:26 +0000 |
| commit | e8dc2f1ff837e32b9d02d65ab520d16187450bf9 (patch) | |
| tree | b5c8ef60f013a1a38e8e3f3bf78a8bed3351b100 /extensions/browser/api/serial | |
| parent | ea76f5f5c3d6e0f73876d040265ad121346e9f3d (diff) | |
| download | chromium_src-e8dc2f1ff837e32b9d02d65ab520d16187450bf9.zip chromium_src-e8dc2f1ff837e32b9d02d65ab520d16187450bf9.tar.gz chromium_src-e8dc2f1ff837e32b9d02d65ab520d16187450bf9.tar.bz2 | |
Use extensions::ResultCatcher; delete ExtensionApiTest::ResultCatcher.
BUG=388893
Review URL: https://codereview.chromium.org/555633003
Cr-Commit-Position: refs/heads/master@{#294031}
Diffstat (limited to 'extensions/browser/api/serial')
| -rw-r--r-- | extensions/browser/api/serial/serial_apitest.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/extensions/browser/api/serial/serial_apitest.cc b/extensions/browser/api/serial/serial_apitest.cc index 22089c9c..db7617a 100644 --- a/extensions/browser/api/serial/serial_apitest.cc +++ b/extensions/browser/api/serial/serial_apitest.cc @@ -10,6 +10,7 @@ #include "extensions/browser/api/serial/serial_connection.h" #include "extensions/browser/extension_function.h" #include "extensions/common/api/serial.h" +#include "extensions/test/result_catcher.h" #include "testing/gmock/include/gmock/gmock.h" using testing::_; @@ -114,8 +115,8 @@ ExtensionFunction* FakeSerialConnectFunctionFactory() { // #define SIMULATE_SERIAL_PORTS (1) IN_PROC_BROWSER_TEST_F(SerialApiTest, SerialFakeHardware) { - ResultCatcher catcher; - catcher.RestrictToProfile(browser()->profile()); + extensions::ResultCatcher catcher; + catcher.RestrictToBrowserContext(browser()->profile()); #if SIMULATE_SERIAL_PORTS ASSERT_TRUE(extensions::ExtensionFunctionDispatcher::OverrideFunction( @@ -128,8 +129,8 @@ IN_PROC_BROWSER_TEST_F(SerialApiTest, SerialFakeHardware) { } IN_PROC_BROWSER_TEST_F(SerialApiTest, SerialRealHardware) { - ResultCatcher catcher; - catcher.RestrictToProfile(browser()->profile()); + extensions::ResultCatcher catcher; + catcher.RestrictToBrowserContext(browser()->profile()); ASSERT_TRUE(RunExtensionTest("serial/real_hardware")) << message_; } |