| Index: src/platform/window_manager/key_bindings_test.cc
|
| diff --git a/src/platform/window_manager/key_bindings_test.cc b/src/platform/window_manager/key_bindings_test.cc
|
| index d9782c7a6f760350a6d0d96f28b1f8ec14aa7e09..2c77198e58ed429c58b543802cf0a9e78ff6f7d2 100644
|
| --- a/src/platform/window_manager/key_bindings_test.cc
|
| +++ b/src/platform/window_manager/key_bindings_test.cc
|
| @@ -20,7 +20,9 @@
|
| DEFINE_bool(logtostderr, false,
|
| "Print debugging messages to stderr (suppressed otherwise)");
|
|
|
| -namespace chromeos {
|
| +namespace window_manager {
|
| +
|
| +using chromeos::NewPermanentCallback;
|
|
|
| struct TestAction {
|
| explicit TestAction(const std::string& name_param)
|
| @@ -92,8 +94,8 @@ class KeyBindingTest : public ::testing::Test {
|
| }
|
| }
|
|
|
| - scoped_ptr<chromeos::XConnection> xconn_;
|
| - scoped_ptr<chromeos::KeyBindings> bindings_;
|
| + scoped_ptr<window_manager::XConnection> xconn_;
|
| + scoped_ptr<window_manager::KeyBindings> bindings_;
|
| std::vector<TestAction*> actions_;
|
|
|
| static const int kNumActions = 10;
|
| @@ -343,5 +345,5 @@ TEST_F(KeyBindingTest, ManyActionsAndBindings) {
|
| } // namespace
|
|
|
| int main(int argc, char **argv) {
|
| - return chromeos::InitAndRunTests(&argc, argv, &FLAGS_logtostderr);
|
| + return window_manager::InitAndRunTests(&argc, argv, &FLAGS_logtostderr);
|
| }
|
|
|