Revert 170660

chrome/browser/sync/test/integration/single_client_apps_sync_test.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // 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:
   SingleClientAppsSyncTest() : SyncTest(SINGLE_CLIENT) {}
 
   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);
 };
 
 IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, StartWithNoApps) {
   ASSERT_TRUE(SetupSync());
 
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
@@ skipping 16 matching lines @@
 
   const int kNumApps = 5;
   for (int i = 0; i < kNumApps; ++i) {
     InstallPlatformApp(GetProfile(0), i);
     InstallPlatformApp(verifier(), i);
   }
 
   ASSERT_TRUE(SetupSync());
 
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
-
-  WaitForPlatformAppsToUnload();
 }
 
 IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, InstallSomeLegacyApps) {
   ASSERT_TRUE(SetupSync());
 
   const int kNumApps = 5;
   for (int i = 0; i < kNumApps; ++i) {
     InstallApp(GetProfile(0), i);
     InstallApp(verifier(), i);
   }
@@ skipping 10 matching lines @@
   const int kNumApps = 5;
   for (int i = 0; i < kNumApps; ++i) {
     InstallPlatformApp(GetProfile(0), i);
     InstallPlatformApp(verifier(), i);
   }
 
   ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion(
       "Waiting for app changes."));
 
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
-
-  WaitForPlatformAppsToUnload();
 }
 
 IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, InstallSomeApps) {
   ASSERT_TRUE(SetupSync());
 
   int i = 0;
 
   const int kNumApps = 5;
   for (int j = 0; j < kNumApps; ++i, ++j) {
     InstallApp(GetProfile(0), i);
     InstallApp(verifier(), i);
   }
 
   const int kNumPlatformApps = 5;
   for (int j = 0; j < kNumPlatformApps; ++i, ++j) {
     InstallPlatformApp(GetProfile(0), i);
     InstallPlatformApp(verifier(), i);
   }
 
   ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion(
       "Waiting for app changes."));
 
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
-
-  WaitForPlatformAppsToUnload();
 }