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

Side by Side Diff: remoting/host/chromoting_host_unittest.cc

Issue 7149008: Cleanup: base/scoped_ptr.h -> base/memory/scoped_ptr.h. (part 2) (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix nits Created 9 years, 6 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 | « remoting/base/encoder_vp8_unittest.cc ('k') | webkit/fileapi/file_system_directory_database.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) 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/bind.h" 5 #include "base/bind.h"
6 #include "base/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/task.h" 7 #include "base/task.h"
8 #include "remoting/host/capturer_fake.h" 8 #include "remoting/host/capturer_fake.h"
9 #include "remoting/host/chromoting_host.h" 9 #include "remoting/host/chromoting_host.h"
10 #include "remoting/host/chromoting_host_context.h" 10 #include "remoting/host/chromoting_host_context.h"
11 #include "remoting/host/host_mock_objects.h" 11 #include "remoting/host/host_mock_objects.h"
12 #include "remoting/host/in_memory_host_config.h" 12 #include "remoting/host/in_memory_host_config.h"
13 #include "remoting/proto/video.pb.h" 13 #include "remoting/proto/video.pb.h"
14 #include "remoting/protocol/protocol_mock_objects.h" 14 #include "remoting/protocol/protocol_mock_objects.h"
15 #include "remoting/protocol/session_config.h" 15 #include "remoting/protocol/session_config.h"
16 #include "testing/gmock_mutant.h" 16 #include "testing/gmock_mutant.h"
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 EXPECT_CALL(*connection_.get(), Disconnect()) 472 EXPECT_CALL(*connection_.get(), Disconnect())
473 .InSequence(s1, s2) 473 .InSequence(s1, s2)
474 .RetiresOnSaturation(); 474 .RetiresOnSaturation();
475 } 475 }
476 SimulateClientConnection(0, true); 476 SimulateClientConnection(0, true);
477 message_loop_.Run(); 477 message_loop_.Run();
478 host_->set_me2mom(false); 478 host_->set_me2mom(false);
479 EXPECT_THAT(curtain_activated, false); 479 EXPECT_THAT(curtain_activated, false);
480 } 480 }
481 } // namespace remoting 481 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/base/encoder_vp8_unittest.cc ('k') | webkit/fileapi/file_system_directory_database.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698