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

Side by Side Diff: base/win/scoped_comptr_unittest.cc

Issue 1218243002: Fix some clang warnings with -Wmissing-braces in base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 5 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 | « base/trace_event/trace_event_win.cc ('k') | base/win/scoped_variant.cc » ('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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/win/scoped_comptr.h" 5 #include "base/win/scoped_comptr.h"
6 6
7 #include <shlobj.h> 7 #include <shlobj.h>
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/win/scoped_com_initializer.h" 10 #include "base/win/scoped_com_initializer.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 12
13 namespace base { 13 namespace base {
14 namespace win { 14 namespace win {
15 15
16 namespace { 16 namespace {
17 17
18 struct Dummy { 18 struct Dummy {
19 Dummy() : adds(0), releases(0) { } 19 Dummy() : adds(0), releases(0) { }
20 void AddRef() { ++adds; } 20 void AddRef() { ++adds; }
21 void Release() { ++releases; } 21 void Release() { ++releases; }
22 22
23 int adds; 23 int adds;
24 int releases; 24 int releases;
25 }; 25 };
26 26
27 extern const IID dummy_iid; 27 extern const IID dummy_iid;
28 const IID dummy_iid = { 0x12345678u, 0x1234u, 0x5678u, 01, 23, 45, 67, 89, 28 const IID dummy_iid = {0x12345678u,
29 01, 23, 45 }; 29 0x1234u,
30 0x5678u,
31 {01, 23, 45, 67, 89, 01, 23, 45}};
30 32
31 } // namespace 33 } // namespace
32 34
33 TEST(ScopedComPtrTest, ScopedComPtr) { 35 TEST(ScopedComPtrTest, ScopedComPtr) {
34 EXPECT_EQ(memcmp(&ScopedComPtr<IUnknown>::iid(), &IID_IUnknown, sizeof(IID)), 36 EXPECT_EQ(memcmp(&ScopedComPtr<IUnknown>::iid(), &IID_IUnknown, sizeof(IID)),
35 0); 37 0);
36 38
37 base::win::ScopedCOMInitializer com_initializer; 39 base::win::ScopedCOMInitializer com_initializer;
38 EXPECT_TRUE(com_initializer.succeeded()); 40 EXPECT_TRUE(com_initializer.succeeded());
39 41
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 bleh.pop_back(); 104 bleh.pop_back();
103 EXPECT_EQ(p->adds, 4); 105 EXPECT_EQ(p->adds, 4);
104 EXPECT_EQ(p->releases, 2); 106 EXPECT_EQ(p->releases, 2);
105 } 107 }
106 EXPECT_EQ(p->adds, 4); 108 EXPECT_EQ(p->adds, 4);
107 EXPECT_EQ(p->releases, 4); 109 EXPECT_EQ(p->releases, 4);
108 } 110 }
109 111
110 } // namespace win 112 } // namespace win
111 } // namespace base 113 } // namespace base
OLDNEW
« no previous file with comments | « base/trace_event/trace_event_win.cc ('k') | base/win/scoped_variant.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698