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

Side by Side Diff: chrome/browser/chromeos/cros/cros_mock.cc

Issue 6992074: Remove --enable-vpn (enabled always) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 7 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/browser/about_flags.cc ('k') | chrome/browser/chromeos/status/network_menu.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 "chrome/browser/chromeos/cros/cros_mock.h" 5 #include "chrome/browser/chromeos/cros/cros_mock.h"
6 6
7 #include "base/memory/ref_counted.h" 7 #include "base/memory/ref_counted.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h" 10 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 .WillRepeatedly((Return((const VirtualNetwork*)(NULL)))); 269 .WillRepeatedly((Return((const VirtualNetwork*)(NULL))));
270 EXPECT_CALL(*mock_network_library_, wifi_networks()) 270 EXPECT_CALL(*mock_network_library_, wifi_networks())
271 .Times(AnyNumber()) 271 .Times(AnyNumber())
272 .WillRepeatedly((ReturnRef(wifi_networks_))); 272 .WillRepeatedly((ReturnRef(wifi_networks_)));
273 EXPECT_CALL(*mock_network_library_, cellular_networks()) 273 EXPECT_CALL(*mock_network_library_, cellular_networks())
274 .Times(AnyNumber()) 274 .Times(AnyNumber())
275 .WillRepeatedly((ReturnRef(cellular_networks_))); 275 .WillRepeatedly((ReturnRef(cellular_networks_)));
276 EXPECT_CALL(*mock_network_library_, virtual_networks()) 276 EXPECT_CALL(*mock_network_library_, virtual_networks())
277 .Times(AnyNumber()) 277 .Times(AnyNumber())
278 .WillRepeatedly((ReturnRef(virtual_networks_))); 278 .WillRepeatedly((ReturnRef(virtual_networks_)));
279 EXPECT_CALL(*mock_network_library_, connected_network())
280 .Times(AnyNumber())
281 .WillRepeatedly((Return((const Network*)(NULL))));
279 282
280 // Set specific expectations for interesting functions: 283 // Set specific expectations for interesting functions:
281 284
282 // NetworkMenuButton::OnNetworkChanged() calls: 285 // NetworkMenuButton::OnNetworkChanged() calls:
283 EXPECT_CALL(*mock_network_library_, Connected()) 286 EXPECT_CALL(*mock_network_library_, Connected())
284 .Times(AnyNumber()) 287 .Times(AnyNumber())
285 .WillRepeatedly((Return(false))) 288 .WillRepeatedly((Return(false)))
286 .RetiresOnSaturation(); 289 .RetiresOnSaturation();
287 EXPECT_CALL(*mock_network_library_, Connecting()) 290 EXPECT_CALL(*mock_network_library_, Connecting())
288 .Times(AnyNumber()) 291 .Times(AnyNumber())
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 } 403 }
401 404
402 InputMethodDescriptors* CrosMock::CreateInputMethodDescriptors() { 405 InputMethodDescriptors* CrosMock::CreateInputMethodDescriptors() {
403 InputMethodDescriptors* descriptors = new InputMethodDescriptors; 406 InputMethodDescriptors* descriptors = new InputMethodDescriptors;
404 descriptors->push_back( 407 descriptors->push_back(
405 input_method::GetFallbackInputMethodDescriptor()); 408 input_method::GetFallbackInputMethodDescriptor());
406 return descriptors; 409 return descriptors;
407 } 410 }
408 411
409 } // namespace chromeos 412 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/chromeos/status/network_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698