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

Side by Side Diff: chrome/browser/chromeos/settings/session_manager_operation_unittest.cc

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h Created 6 years, 2 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
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/settings/session_manager_operation.h" 5 #include "chrome/browser/chromeos/settings/session_manager_operation.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 30 matching lines...) Expand all
41 public: 41 public:
42 SessionManagerOperationTest() 42 SessionManagerOperationTest()
43 : ui_thread_(content::BrowserThread::UI, &message_loop_), 43 : ui_thread_(content::BrowserThread::UI, &message_loop_),
44 file_thread_(content::BrowserThread::FILE, &message_loop_), 44 file_thread_(content::BrowserThread::FILE, &message_loop_),
45 owner_key_util_(new ownership::MockOwnerKeyUtil()), 45 owner_key_util_(new ownership::MockOwnerKeyUtil()),
46 validated_(false) { 46 validated_(false) {
47 OwnerSettingsServiceChromeOSFactory::GetInstance() 47 OwnerSettingsServiceChromeOSFactory::GetInstance()
48 ->SetOwnerKeyUtilForTesting(owner_key_util_); 48 ->SetOwnerKeyUtilForTesting(owner_key_util_);
49 } 49 }
50 50
51 virtual void SetUp() OVERRIDE { 51 virtual void SetUp() override {
52 policy_.payload().mutable_pinned_apps()->add_app_id("fake-app"); 52 policy_.payload().mutable_pinned_apps()->add_app_id("fake-app");
53 policy_.Build(); 53 policy_.Build();
54 54
55 profile_.reset(new TestingProfile()); 55 profile_.reset(new TestingProfile());
56 service_ = 56 service_ =
57 OwnerSettingsServiceChromeOSFactory::GetForProfile(profile_.get()); 57 OwnerSettingsServiceChromeOSFactory::GetForProfile(profile_.get());
58 } 58 }
59 59
60 MOCK_METHOD2(OnOperationCompleted, 60 MOCK_METHOD2(OnOperationCompleted,
61 void(SessionManagerOperation*, DeviceSettingsService::Status)); 61 void(SessionManagerOperation*, DeviceSettingsService::Status));
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 message_loop_.RunUntilIdle(); 271 message_loop_.RunUntilIdle();
272 EXPECT_TRUE(validated_); 272 EXPECT_TRUE(validated_);
273 273
274 // Loaded device settings should match what the operation received. 274 // Loaded device settings should match what the operation received.
275 ASSERT_TRUE(op.device_settings().get()); 275 ASSERT_TRUE(op.device_settings().get());
276 EXPECT_EQ(policy_.payload().SerializeAsString(), 276 EXPECT_EQ(policy_.payload().SerializeAsString(),
277 op.device_settings()->SerializeAsString()); 277 op.device_settings()->SerializeAsString());
278 } 278 }
279 279
280 } // namespace chromeos 280 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698