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

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

Issue 6126002: Remove base/scoped_handle_win.h stub and fix up all callers to use the new location and namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review 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
OLDNEW
1 // Copyright (c) 2009 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 <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/win/scoped_handle.h"
9 #include "base/threading/thread.h" 10 #include "base/threading/thread.h"
10 #include "chrome_frame/bho.h" 11 #include "chrome_frame/bho.h"
11 //#include "chrome_frame/urlmon_moniker.h" 12 //#include "chrome_frame/urlmon_moniker.h"
12 #include "chrome_frame/test/test_server.h" 13 #include "chrome_frame/test/test_server.h"
13 #include "chrome_frame/test/chrome_frame_test_utils.h" 14 #include "chrome_frame/test/chrome_frame_test_utils.h"
14 #include "chrome_frame/test/urlmon_moniker_tests.h" 15 #include "chrome_frame/test/urlmon_moniker_tests.h"
15 #include "gmock/gmock.h" 16 #include "gmock/gmock.h"
16 #include "gtest/gtest.h" 17 #include "gtest/gtest.h"
17 18
18 #define GMOCK_MUTANT_INCLUDE_LATE_OBJECT_BINDING 19 #define GMOCK_MUTANT_INCLUDE_LATE_OBJECT_BINDING
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 } 76 }
76 77
77 bool wait_until_ready() { 78 bool wait_until_ready() {
78 return ::WaitForSingleObject(ready_, kUrlmonMonikerTimeoutSec * 1000) 79 return ::WaitForSingleObject(ready_, kUrlmonMonikerTimeoutSec * 1000)
79 == WAIT_OBJECT_0; 80 == WAIT_OBJECT_0;
80 } 81 }
81 82
82 protected: 83 protected:
83 scoped_ptr<test_server::SimpleWebServer> server_; 84 scoped_ptr<test_server::SimpleWebServer> server_;
84 test_server::SimpleResponse default_response_; 85 test_server::SimpleResponse default_response_;
85 ScopedHandle ready_; 86 base::win::ScopedHandle ready_;
86 }; 87 };
87 88
88 // Helper class for running tests that rely on the NavigationManager. 89 // Helper class for running tests that rely on the NavigationManager.
89 class UrlmonMonikerTestManager { 90 class UrlmonMonikerTestManager {
90 public: 91 public:
91 explicit UrlmonMonikerTestManager(const wchar_t* test_url) { 92 explicit UrlmonMonikerTestManager(const wchar_t* test_url) {
92 EXPECT_EQ(true, MonikerPatch::Initialize()); 93 EXPECT_EQ(true, MonikerPatch::Initialize());
93 } 94 }
94 95
95 ~UrlmonMonikerTestManager() { 96 ~UrlmonMonikerTestManager() {
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 callback2.SetCallbackExpectations( 339 callback2.SetCallbackExpectations(
339 UrlmonMonikerTestCallback::EXPECT_NO_CALL, S_OK, false); 340 UrlmonMonikerTestCallback::EXPECT_NO_CALL, S_OK, false);
340 hr = callback2.CreateUrlMonikerAndBindToStorage(test_url, NULL); 341 hr = callback2.CreateUrlMonikerAndBindToStorage(test_url, NULL);
341 // S_OK means that the operation completed synchronously. 342 // S_OK means that the operation completed synchronously.
342 // Otherwise we'd get MK_S_ASYNCHRONOUS. 343 // Otherwise we'd get MK_S_ASYNCHRONOUS.
343 EXPECT_EQ(S_OK, hr); 344 EXPECT_EQ(S_OK, hr);
344 } 345 }
345 } 346 }
346 347
347 */ 348 */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698