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

Side by Side Diff: chrome/browser/sync/test/integration/two_client_apps_sync_test.cc

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/browser/chrome_notification_types.h" 7 #include "chrome/browser/chrome_notification_types.h"
8 #include "chrome/browser/extensions/app_sync_data.h" 8 #include "chrome/browser/extensions/app_sync_data.h"
9 #include "chrome/browser/extensions/bookmark_app_helper.h" 9 #include "chrome/browser/extensions/bookmark_app_helper.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 } 52 }
53 53
54 } // namespace 54 } // namespace
55 55
56 class TwoClientAppsSyncTest : public SyncTest { 56 class TwoClientAppsSyncTest : public SyncTest {
57 public: 57 public:
58 TwoClientAppsSyncTest() : SyncTest(TWO_CLIENT) {} 58 TwoClientAppsSyncTest() : SyncTest(TWO_CLIENT) {}
59 59
60 virtual ~TwoClientAppsSyncTest() {} 60 virtual ~TwoClientAppsSyncTest() {}
61 61
62 virtual bool TestUsesSelfNotifications() OVERRIDE { return false; } 62 virtual bool TestUsesSelfNotifications() override { return false; }
63 63
64 private: 64 private:
65 DISALLOW_COPY_AND_ASSIGN(TwoClientAppsSyncTest); 65 DISALLOW_COPY_AND_ASSIGN(TwoClientAppsSyncTest);
66 }; 66 };
67 67
68 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, StartWithNoApps) { 68 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, StartWithNoApps) {
69 ASSERT_TRUE(SetupSync()); 69 ASSERT_TRUE(SetupSync());
70 70
71 ASSERT_TRUE(AwaitAllProfilesHaveSameAppsAsVerifier()); 71 ASSERT_TRUE(AwaitAllProfilesHaveSameAppsAsVerifier());
72 } 72 }
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 content::WindowedNotificationObserver windowed_observer( 462 content::WindowedNotificationObserver windowed_observer(
463 extensions::NOTIFICATION_CRX_INSTALLER_DONE, 463 extensions::NOTIFICATION_CRX_INSTALLER_DONE,
464 base::Bind(&AllProfilesHaveSameAppsAsVerifier)); 464 base::Bind(&AllProfilesHaveSameAppsAsVerifier));
465 windowed_observer.Wait(); 465 windowed_observer.Wait();
466 } 466 }
467 } 467 }
468 468
469 // TODO(akalin): Add tests exercising: 469 // TODO(akalin): Add tests exercising:
470 // - Offline installation/uninstallation behavior 470 // - Offline installation/uninstallation behavior
471 // - App-specific properties 471 // - App-specific properties
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698