Revert 75287 - [Sync] Initial support for encrypting any datatype (no UI hook...

chrome/test/live_sync/two_client_live_sessions_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 "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/test/live_sync/live_sessions_sync_test.h"
 
-// TODO(zea): Test each individual session command we care about separately.
+// @TODO(zea): Test each individual session command we care about separately.
 // (as well as multi-window). We're currently only checking basic single-window/
 // single-tab functionality.
 
 IN_PROC_BROWSER_TEST_F(TwoClientLiveSessionsSyncTest, SingleClientChanged) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   ASSERT_TRUE(CheckInitialState(0));
   ASSERT_TRUE(CheckInitialState(1));
 
   std::vector<SessionWindow*>* client0_windows =
       InitializeNewWindowWithTab(0, GURL("about:bubba"));
   ASSERT_TRUE(client0_windows);
 
   GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1));
 
   // Get foreign session data from client 1.
   std::vector<const ForeignSession*> sessions1;
   ASSERT_TRUE(GetSessionData(1, &sessions1));
 
   // Verify client 1's foreign session matches client 0 current window.
   ASSERT_EQ(1U, sessions1.size());
   ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows));
 }
 
-IN_PROC_BROWSER_TEST_F(TwoClientLiveSessionsSyncTest,
-                       SingleClientEnabledEncryption) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
-  ASSERT_TRUE(CheckInitialState(0));
-  ASSERT_TRUE(CheckInitialState(1));
-
-  ASSERT_TRUE(EnableEncryption(0));
-  GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1));
-  ASSERT_TRUE(IsEncrypted(0));
-  ASSERT_TRUE(IsEncrypted(1));
-}
-
-IN_PROC_BROWSER_TEST_F(TwoClientLiveSessionsSyncTest,
-                       SingleClientEnabledEncryptionAndChanged) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
-  ASSERT_TRUE(CheckInitialState(0));
-  ASSERT_TRUE(CheckInitialState(1));
-
-  std::vector<SessionWindow*>* client0_windows =
-      InitializeNewWindowWithTab(0, GURL("about:bubba"));
-  ASSERT_TRUE(client0_windows);
-  ASSERT_TRUE(EnableEncryption(0));
-  GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1));
-
-  // Get foreign session data from client 1.
-  ASSERT_TRUE(IsEncrypted(1));
-  std::vector<const ForeignSession*> sessions1;
-  ASSERT_TRUE(GetSessionData(1, &sessions1));
-
-  // Verify client 1's foreign session matches client 0 current window.
-  ASSERT_EQ(1U, sessions1.size());
-  ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows));
-}
-
-IN_PROC_BROWSER_TEST_F(TwoClientLiveSessionsSyncTest,
-                       BothClientsEnabledEncryption) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
-  ASSERT_TRUE(CheckInitialState(0));
-  ASSERT_TRUE(CheckInitialState(1));
-
-  ASSERT_TRUE(EnableEncryption(0));
-  ASSERT_TRUE(EnableEncryption(1));
-  GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1));
-  ASSERT_TRUE(IsEncrypted(0));
-  ASSERT_TRUE(IsEncrypted(1));
-}
-
 IN_PROC_BROWSER_TEST_F(TwoClientLiveSessionsSyncTest, BothChanged) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   ASSERT_TRUE(CheckInitialState(0));
   ASSERT_TRUE(CheckInitialState(1));
 
   // Open tabs on both clients and retain window information.
   std::vector<SessionWindow*>* client0_windows =
       InitializeNewWindowWithTab(0, GURL("about:bubba0"));
   ASSERT_TRUE(client0_windows);
@@ skipping 10 matching lines @@
   ASSERT_TRUE(GetSessionData(0, &sessions0));
   ASSERT_TRUE(GetSessionData(1, &sessions1));
 
   // Verify client 1's foreign session matches client 0's current window and
   // vice versa.
   ASSERT_EQ(1U, sessions0.size());
   ASSERT_EQ(1U, sessions1.size());
   ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows));
   ASSERT_TRUE(WindowsMatch(sessions0[0]->windows, *client1_windows));
 }