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

Unified Diff: chrome/browser/sync/test/integration/single_client_apps_sync_test.cc

Issue 11299326: Revert 170660 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years 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/sync/test/integration/single_client_apps_sync_test.cc
===================================================================
--- chrome/browser/sync/test/integration/single_client_apps_sync_test.cc (revision 170888)
+++ chrome/browser/sync/test/integration/single_client_apps_sync_test.cc (working copy)
@@ -3,16 +3,13 @@
// found in the LICENSE file.
#include "base/basictypes.h"
-#include "base/command_line.h"
#include "chrome/browser/sync/profile_sync_service_harness.h"
#include "chrome/browser/sync/test/integration/apps_helper.h"
#include "chrome/browser/sync/test/integration/sync_test.h"
-#include "chrome/common/chrome_switches.h"
using apps_helper::AllProfilesHaveSameAppsAsVerifier;
using apps_helper::InstallApp;
using apps_helper::InstallPlatformApp;
-using apps_helper::WaitForPlatformAppsToUnload;
class SingleClientAppsSyncTest : public SyncTest {
public:
@@ -20,14 +17,6 @@
virtual ~SingleClientAppsSyncTest() {}
- protected:
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
- SyncTest::SetUpCommandLine(command_line);
- // Make event pages get suspended quicker.
- command_line->AppendSwitchASCII(switches::kEventPageIdleTime, "1");
- command_line->AppendSwitchASCII(switches::kEventPageUnloadingTime, "1");
- }
-
private:
DISALLOW_COPY_AND_ASSIGN(SingleClientAppsSyncTest);
};
@@ -64,8 +53,6 @@
ASSERT_TRUE(SetupSync());
ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
-
- WaitForPlatformAppsToUnload();
}
IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, InstallSomeLegacyApps) {
@@ -96,8 +83,6 @@
"Waiting for app changes."));
ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
-
- WaitForPlatformAppsToUnload();
}
IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, InstallSomeApps) {
@@ -121,6 +106,4 @@
"Waiting for app changes."));
ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
-
- WaitForPlatformAppsToUnload();
}
« no previous file with comments | « chrome/browser/sync/test/integration/apps_helper.cc ('k') | chrome/browser/sync/test/integration/two_client_apps_sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698