Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(248)

Side by Side Diff: components/resource_provider/resource_provider_apptest.cc

Issue 1142323003: Remove duplicate application cpp files in mojo/application. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « components/resource_provider/main.cc ('k') | components/surfaces/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 6
7 #include "base/containers/scoped_ptr_hash_map.h" 7 #include "base/containers/scoped_ptr_hash_map.h"
8 #include "base/files/file.h" 8 #include "base/files/file.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "components/resource_provider/public/cpp/resource_loader.h" 10 #include "components/resource_provider/public/cpp/resource_loader.h"
11 #include "components/resource_provider/public/interfaces/resource_provider.mojom .h" 11 #include "components/resource_provider/public/interfaces/resource_provider.mojom .h"
12 #include "mojo/application/application_test_base_chromium.h"
13 #include "mojo/application/public/cpp/application_delegate.h" 12 #include "mojo/application/public/cpp/application_delegate.h"
14 #include "mojo/application/public/cpp/application_impl.h" 13 #include "mojo/application/public/cpp/application_impl.h"
14 #include "mojo/application/public/cpp/application_test_base.h"
15 #include "mojo/application/public/cpp/service_provider_impl.h" 15 #include "mojo/application/public/cpp/service_provider_impl.h"
16 #include "mojo/common/common_type_converters.h" 16 #include "mojo/common/common_type_converters.h"
17 #include "mojo/platform_handle/platform_handle_functions.h" 17 #include "mojo/platform_handle/platform_handle_functions.h"
18 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" 18 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
19 #include "third_party/mojo/src/mojo/public/cpp/system/macros.h" 19 #include "third_party/mojo/src/mojo/public/cpp/system/macros.h"
20 20
21 namespace resource_provider { 21 namespace resource_provider {
22 namespace { 22 namespace {
23 23
24 std::string ReadFile(base::File* file) { 24 std::string ReadFile(base::File* file) {
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 GetResources(SetWithStrings("sample", "dir/sample2"))); 88 GetResources(SetWithStrings("sample", "dir/sample2")));
89 ASSERT_TRUE(results.count("sample") > 0u); 89 ASSERT_TRUE(results.count("sample") > 0u);
90 EXPECT_EQ("test data\n", results["sample"]); 90 EXPECT_EQ("test data\n", results["sample"]);
91 91
92 ASSERT_TRUE(results.count("dir/sample2") > 0u); 92 ASSERT_TRUE(results.count("dir/sample2") > 0u);
93 EXPECT_EQ("xxyy\n", results["dir/sample2"]); 93 EXPECT_EQ("xxyy\n", results["dir/sample2"]);
94 } 94 }
95 95
96 } // namespace 96 } // namespace
97 } // namespace resource_provider 97 } // namespace resource_provider
OLDNEW
« no previous file with comments | « components/resource_provider/main.cc ('k') | components/surfaces/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698