| OLD | NEW | 
|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "mojo/shell/background/background_shell.h" | 5 #include "services/shell/background/background_shell.h" | 
| 6 | 6 | 
| 7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" | 
| 8 #include "mojo/shell/background/tests/test.mojom.h" | 8 #include "services/shell/background/tests/test.mojom.h" | 
| 9 #include "mojo/shell/background/tests/test_catalog_store.h" | 9 #include "services/shell/background/tests/test_catalog_store.h" | 
| 10 #include "mojo/shell/public/cpp/connector.h" | 10 #include "services/shell/public/cpp/connector.h" | 
| 11 #include "mojo/shell/public/cpp/shell_client.h" | 11 #include "services/shell/public/cpp/shell_client.h" | 
| 12 #include "mojo/shell/public/cpp/shell_connection.h" | 12 #include "services/shell/public/cpp/shell_connection.h" | 
| 13 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" | 
| 14 | 14 | 
| 15 namespace mojo { | 15 namespace mojo { | 
| 16 namespace shell { | 16 namespace shell { | 
| 17 namespace { | 17 namespace { | 
| 18 | 18 | 
| 19 const char kTestName[] = "mojo:test-app"; | 19 const char kTestName[] = "mojo:test-app"; | 
| 20 | 20 | 
| 21 class ShellClientImpl : public ShellClient { | 21 class ShellClientImpl : public ShellClient { | 
| 22  public: | 22  public: | 
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 66     got_result = true; | 66     got_result = true; | 
| 67     run_loop.Quit(); | 67     run_loop.Quit(); | 
| 68   }); | 68   }); | 
| 69   run_loop.Run(); | 69   run_loop.Run(); | 
| 70   EXPECT_TRUE(got_result); | 70   EXPECT_TRUE(got_result); | 
| 71   EXPECT_TRUE(store->get_store_called()); | 71   EXPECT_TRUE(store->get_store_called()); | 
| 72 } | 72 } | 
| 73 | 73 | 
| 74 }  // namespace shell | 74 }  // namespace shell | 
| 75 }  // namespace mojo | 75 }  // namespace mojo | 
| OLD | NEW | 
|---|