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

Side by Side Diff: mojo/public/cpp/environment/tests/logging_unittest.cc

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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/public/cpp/environment/tests/logger_unittest.cc ('k') | mojo/public/cpp/system/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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <stdlib.h> 5 #include <stdlib.h>
6 6
7 #include <sstream> 7 #include <sstream>
8 #include <string> 8 #include <string>
9 9
10 #include "mojo/public/cpp/environment/environment.h"
11 #include "mojo/public/cpp/environment/logging.h"
12 #include "mojo/public/cpp/system/macros.h"
10 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
11 #include "third_party/mojo/src/mojo/public/cpp/environment/environment.h"
12 #include "third_party/mojo/src/mojo/public/cpp/environment/logging.h"
13 #include "third_party/mojo/src/mojo/public/cpp/system/macros.h"
14 14
15 namespace mojo { 15 namespace mojo {
16 namespace { 16 namespace {
17 17
18 // The current logging system strips the path, so we need our filename. 18 // The current logging system strips the path, so we need our filename.
19 const char kOurFilename[] = "logging_unittest.cc"; 19 const char kOurFilename[] = "logging_unittest.cc";
20 20
21 class PtrToMemberHelper { 21 class PtrToMemberHelper {
22 public: 22 public:
23 int member; 23 int member;
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 ResetMockLogger(); 512 ResetMockLogger();
513 513
514 // Also try to make sure that we parenthesize the condition properly. 514 // Also try to make sure that we parenthesize the condition properly.
515 bool x = true; 515 bool x = true;
516 MOJO_DCHECK(false || x) << "hello"; 516 MOJO_DCHECK(false || x) << "hello";
517 EXPECT_FALSE(log_message_was_called()); 517 EXPECT_FALSE(log_message_was_called());
518 } 518 }
519 519
520 } // namespace 520 } // namespace
521 } // namespace mojo 521 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/public/cpp/environment/tests/logger_unittest.cc ('k') | mojo/public/cpp/system/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698