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

Unified Diff: chrome/browser/chromeos/login/login_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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/login_browsertest.cc
diff --git a/chrome/browser/chromeos/login/login_browsertest.cc b/chrome/browser/chromeos/login/login_browsertest.cc
index 1e130b5e9064250d20fe5a06c013637e786b3574..0e1503d355171ea96c970d8182492a414f0c2a40 100644
--- a/chrome/browser/chromeos/login/login_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_browsertest.cc
@@ -3,7 +3,6 @@
// found in the LICENSE file.
#include "base/command_line.h"
-#include "base/time.h"
#include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
#include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
#include "chrome/browser/chromeos/cros/mock_network_library.h"
@@ -15,12 +14,12 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace chromeos {
using ::testing::_;
using ::testing::AnyNumber;
-using ::testing::AtLeast;
using ::testing::Return;
+namespace chromeos {
+
class LoginTestBase : public CrosInProcessBrowserTest {
public:
LoginTestBase()
@@ -37,8 +36,12 @@ class LoginTestBase : public CrosInProcessBrowserTest {
mock_network_library_ = cros_mock_->mock_network_library();
EXPECT_CALL(*mock_cryptohome_library_, GetSystemSalt())
.WillRepeatedly(Return(std::string("stub_system_salt")));
+ EXPECT_CALL(*mock_cryptohome_library_, InstallAttributesIsReady())
+ .WillRepeatedly(Return(false));
EXPECT_CALL(*mock_network_library_, AddUserActionObserver(_))
.Times(AnyNumber());
+ EXPECT_CALL(*mock_network_library_, LoadOncNetworks(_, _, _, _))
+ .WillRepeatedly(Return(true));
}
MockCryptohomeLibrary* mock_cryptohome_library_;

Powered by Google App Engine
This is Rietveld 408576698