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

Side by Side Diff: chrome_frame/test/chrome_frame_test_utils.h

Issue 6676030: WinDDK ATL and MSVC express compatability (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Address comments; r78670; make atlcheck.h not pull in header Created 9 years, 9 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 | Annotate | Revision Log
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 #ifndef CHROME_FRAME_TEST_CHROME_FRAME_TEST_UTILS_H_ 5 #ifndef CHROME_FRAME_TEST_CHROME_FRAME_TEST_UTILS_H_
6 #define CHROME_FRAME_TEST_CHROME_FRAME_TEST_UTILS_H_ 6 #define CHROME_FRAME_TEST_CHROME_FRAME_TEST_UTILS_H_
7 7
8 #include <windows.h>
9
10 #include <atlbase.h> 8 #include <atlbase.h>
11 #include <atlwin.h> 9 #include <atlwin.h>
12 10
13 #include <string> 11 #include <string>
14 12
15 #include "base/basictypes.h" 13 #include "base/basictypes.h"
16 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
17 #include "base/message_loop.h" 15 #include "base/message_loop.h"
18 #include "base/process_util.h" 16 #include "base/process_util.h"
19 #include "base/scoped_comptr_win.h" 17 #include "base/scoped_comptr_win.h"
20 #include "base/scoped_ptr.h" 18 #include "base/scoped_ptr.h"
19 #include "base/win/atlcheck.h"
21 #include "base/win/registry.h" 20 #include "base/win/registry.h"
22
23 #include "chrome_frame/test_utils.h" 21 #include "chrome_frame/test_utils.h"
24 #include "chrome_frame/test/simulate_input.h" 22 #include "chrome_frame/test/simulate_input.h"
25 #include "chrome_frame/utils.h" 23 #include "chrome_frame/utils.h"
26 24
27 // Include without path to make GYP build see it. 25 // Include without path to make GYP build see it.
28 #include "chrome_tab.h" // NOLINT 26 #include "chrome_tab.h" // NOLINT
29 27
30 #include "gtest/gtest.h" 28 #include "gtest/gtest.h"
31 29
32 // Needed for CreateFunctor. 30 // Needed for CreateFunctor.
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 } // namespace chrome_frame_test 333 } // namespace chrome_frame_test
336 334
337 // TODO(tommi): This is a temporary workaround while we're getting our 335 // TODO(tommi): This is a temporary workaround while we're getting our
338 // Singleton story straight. Ideally each test should clear up any singletons 336 // Singleton story straight. Ideally each test should clear up any singletons
339 // it might have created, but test cases do not implicitly have their own 337 // it might have created, but test cases do not implicitly have their own
340 // AtExitManager, so we have this workaround method for tests that depend on 338 // AtExitManager, so we have this workaround method for tests that depend on
341 // "fresh" singletons. The implementation is in chrome_frame_unittest_main.cc. 339 // "fresh" singletons. The implementation is in chrome_frame_unittest_main.cc.
342 void DeleteAllSingletons(); 340 void DeleteAllSingletons();
343 341
344 #endif // CHROME_FRAME_TEST_CHROME_FRAME_TEST_UTILS_H_ 342 #endif // CHROME_FRAME_TEST_CHROME_FRAME_TEST_UTILS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698