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

Side by Side Diff: chrome_frame/test/urlmon_moniker_integration_test.cc

Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 11 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
« no previous file with comments | « chrome_frame/metrics_service.cc ('k') | chrome_frame/urlmon_url_request.h » ('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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 <atlbase.h> 5 #include <atlbase.h>
6 #include <atlcom.h> 6 #include <atlcom.h>
7 7
8 #include "base/scoped_comptr_win.h" 8 #include "base/scoped_comptr_win.h"
9 #include "base/thread.h" 9 #include "base/threading/thread.h"
10 #include "chrome_frame/bho.h" 10 #include "chrome_frame/bho.h"
11 //#include "chrome_frame/urlmon_moniker.h" 11 //#include "chrome_frame/urlmon_moniker.h"
12 #include "chrome_frame/test/test_server.h" 12 #include "chrome_frame/test/test_server.h"
13 #include "chrome_frame/test/chrome_frame_test_utils.h" 13 #include "chrome_frame/test/chrome_frame_test_utils.h"
14 #include "chrome_frame/test/urlmon_moniker_tests.h" 14 #include "chrome_frame/test/urlmon_moniker_tests.h"
15 #include "gmock/gmock.h" 15 #include "gmock/gmock.h"
16 #include "gtest/gtest.h" 16 #include "gtest/gtest.h"
17 17
18 #define GMOCK_MUTANT_INCLUDE_LATE_OBJECT_BINDING 18 #define GMOCK_MUTANT_INCLUDE_LATE_OBJECT_BINDING
19 #include "testing/gmock_mutant.h" 19 #include "testing/gmock_mutant.h"
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 callback2.SetCallbackExpectations( 338 callback2.SetCallbackExpectations(
339 UrlmonMonikerTestCallback::EXPECT_NO_CALL, S_OK, false); 339 UrlmonMonikerTestCallback::EXPECT_NO_CALL, S_OK, false);
340 hr = callback2.CreateUrlMonikerAndBindToStorage(test_url, NULL); 340 hr = callback2.CreateUrlMonikerAndBindToStorage(test_url, NULL);
341 // S_OK means that the operation completed synchronously. 341 // S_OK means that the operation completed synchronously.
342 // Otherwise we'd get MK_S_ASYNCHRONOUS. 342 // Otherwise we'd get MK_S_ASYNCHRONOUS.
343 EXPECT_EQ(S_OK, hr); 343 EXPECT_EQ(S_OK, hr);
344 } 344 }
345 } 345 }
346 346
347 */ 347 */
OLDNEW
« no previous file with comments | « chrome_frame/metrics_service.cc ('k') | chrome_frame/urlmon_url_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698