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

Side by Side Diff: sql/mojo/sql_test_base.h

Issue 1296453004: Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cherry-pick GL_APIENTRY addition back in Created 5 years, 4 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 | « mojo/tools/rev_sdk.py ('k') | third_party/mojo/mojo_edk.gyp » ('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 #ifndef SQL_MOJO_SQL_TEST_BASE_H_ 5 #ifndef SQL_MOJO_SQL_TEST_BASE_H_
6 #define SQL_MOJO_SQL_TEST_BASE_H_ 6 #define SQL_MOJO_SQL_TEST_BASE_H_
7 7
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "components/filesystem/public/interfaces/file_system.mojom.h" 10 #include "components/filesystem/public/interfaces/file_system.mojom.h"
11 #include "mojo/application/public/cpp/application_test_base.h" 11 #include "mojo/application/public/cpp/application_test_base.h"
12 #include "mojo/public/cpp/bindings/binding.h"
12 #include "sql/connection.h" 13 #include "sql/connection.h"
13 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
14 15
15 namespace sql { 16 namespace sql {
16 17
17 class Connection; 18 class Connection;
18 class ScopedMojoFilesystemVFS; 19 class ScopedMojoFilesystemVFS;
19 20
20 // Base class for SQL tests. 21 // Base class for SQL tests.
21 // 22 //
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 scoped_ptr<ScopedMojoFilesystemVFS> vfs_; 82 scoped_ptr<ScopedMojoFilesystemVFS> vfs_;
82 mojo::Binding<filesystem::FileSystemClient> binding_; 83 mojo::Binding<filesystem::FileSystemClient> binding_;
83 sql::Connection db_; 84 sql::Connection db_;
84 85
85 DISALLOW_COPY_AND_ASSIGN(SQLTestBase); 86 DISALLOW_COPY_AND_ASSIGN(SQLTestBase);
86 }; 87 };
87 88
88 } // namespace sql 89 } // namespace sql
89 90
90 #endif // SQL_MOJO_SQL_TEST_BASE_H_ 91 #endif // SQL_MOJO_SQL_TEST_BASE_H_
OLDNEW
« no previous file with comments | « mojo/tools/rev_sdk.py ('k') | third_party/mojo/mojo_edk.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698