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

Side by Side Diff: chrome/browser/chromeos/login/login_utils_browsertest.cc

Issue 10855244: Remove the --enable-device-policy and --enable-onc-policy flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updated comment Created 8 years, 4 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/login/login_utils.h" 5 #include "chrome/browser/chromeos/login/login_utils.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 io_thread_(content::BrowserThread::IO), 112 io_thread_(content::BrowserThread::IO),
113 mock_async_method_caller_(NULL), 113 mock_async_method_caller_(NULL),
114 connector_(NULL), 114 connector_(NULL),
115 cryptohome_(NULL), 115 cryptohome_(NULL),
116 prepared_profile_(NULL) {} 116 prepared_profile_(NULL) {}
117 117
118 virtual void SetUp() OVERRIDE { 118 virtual void SetUp() OVERRIDE {
119 ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir()); 119 ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir());
120 120
121 CommandLine* command_line = CommandLine::ForCurrentProcess(); 121 CommandLine* command_line = CommandLine::ForCurrentProcess();
122 command_line->AppendSwitch(switches::kEnableDevicePolicy);
123 command_line->AppendSwitchASCII(switches::kDeviceManagementUrl, kDMServer); 122 command_line->AppendSwitchASCII(switches::kDeviceManagementUrl, kDMServer);
124 command_line->AppendSwitchASCII(switches::kLoginProfile, "user"); 123 command_line->AppendSwitchASCII(switches::kLoginProfile, "user");
125 124
126 local_state_.Get()->RegisterStringPref(prefs::kApplicationLocale, ""); 125 local_state_.Get()->RegisterStringPref(prefs::kApplicationLocale, "");
127 126
128 // DBusThreadManager should be initialized before io_thread_state_, as 127 // DBusThreadManager should be initialized before io_thread_state_, as
129 // DBusThreadManager is used from chromeos::ProxyConfigServiceImpl, 128 // DBusThreadManager is used from chromeos::ProxyConfigServiceImpl,
130 // which is part of io_thread_state_. 129 // which is part of io_thread_state_.
131 DBusThreadManager::InitializeForTesting(&mock_dbus_thread_manager_); 130 DBusThreadManager::InitializeForTesting(&mock_dbus_thread_manager_);
132 131
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 } 511 }
513 512
514 INSTANTIATE_TEST_CASE_P( 513 INSTANTIATE_TEST_CASE_P(
515 LoginUtilsBlockingLoginTestInstance, 514 LoginUtilsBlockingLoginTestInstance,
516 LoginUtilsBlockingLoginTest, 515 LoginUtilsBlockingLoginTest,
517 testing::Values(0, 1, 2, 3, 4, 5)); 516 testing::Values(0, 1, 2, 3, 4, 5));
518 517
519 } // namespace 518 } // namespace
520 519
521 } 520 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698