| 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 <stdint.h> | 5 #include <stdint.h> |
| 6 #include <utility> | 6 #include <utility> |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 namespace ui { | 21 namespace ui { |
| 22 namespace clipboard { | 22 namespace clipboard { |
| 23 namespace { | 23 namespace { |
| 24 | 24 |
| 25 const char* kUninitialized = "Uninitialized data"; | 25 const char* kUninitialized = "Uninitialized data"; |
| 26 const char* kPlainTextData = "Some plain data"; | 26 const char* kPlainTextData = "Some plain data"; |
| 27 const char* kHtmlData = "<html>data</html>"; | 27 const char* kHtmlData = "<html>data</html>"; |
| 28 | 28 |
| 29 } // namespace | 29 } // namespace |
| 30 | 30 |
| 31 class ClipboardAppTest : public shell::test::ServiceTest { | 31 class ClipboardAppTest : public service_manager::test::ServiceTest { |
| 32 public: | 32 public: |
| 33 ClipboardAppTest() : ServiceTest("exe:mus_clipboard_unittests") {} | 33 ClipboardAppTest() : ServiceTest("exe:mus_clipboard_unittests") {} |
| 34 ~ClipboardAppTest() override {} | 34 ~ClipboardAppTest() override {} |
| 35 | 35 |
| 36 // Overridden from shell::test::ServiceTest: | 36 // Overridden from service_manager::test::ServiceTest: |
| 37 void SetUp() override { | 37 void SetUp() override { |
| 38 ServiceTest::SetUp(); | 38 ServiceTest::SetUp(); |
| 39 | 39 |
| 40 connector()->ConnectToInterface("service:ui", &clipboard_); | 40 connector()->ConnectToInterface("service:ui", &clipboard_); |
| 41 ASSERT_TRUE(clipboard_); | 41 ASSERT_TRUE(clipboard_); |
| 42 } | 42 } |
| 43 | 43 |
| 44 uint64_t GetSequenceNumber() { | 44 uint64_t GetSequenceNumber() { |
| 45 uint64_t sequence_num = 999999; | 45 uint64_t sequence_num = 999999; |
| 46 EXPECT_TRUE(clipboard_->GetSequenceNumber( | 46 EXPECT_TRUE(clipboard_->GetSequenceNumber( |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 clipboard_->WriteClipboardData(Clipboard::Type::COPY_PASTE, | 136 clipboard_->WriteClipboardData(Clipboard::Type::COPY_PASTE, |
| 137 std::move(mime_data), | 137 std::move(mime_data), |
| 138 &sequence_num); | 138 &sequence_num); |
| 139 | 139 |
| 140 EXPECT_EQ(2ul, sequence_num); | 140 EXPECT_EQ(2ul, sequence_num); |
| 141 EXPECT_FALSE(GetDataOfType(mojom::kMimeTypeText, &data)); | 141 EXPECT_FALSE(GetDataOfType(mojom::kMimeTypeText, &data)); |
| 142 } | 142 } |
| 143 | 143 |
| 144 } // namespace clipboard | 144 } // namespace clipboard |
| 145 } // namespace ui | 145 } // namespace ui |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2420253002:
Rename shell namespace to service_manager (Closed)
