Don't try to read notifications state from sync DB

We no longer want to store notifications data in the sync DB.  Previous
patches have implemented a new storage system, but left in place some
code to ensure backwards compatibility.  That was almost a year ago.
It's now safe to remove the barckwards compatibility code.

This commit removes all support for reading notifications state from the
sync DB.  It also removes some tests and related functions.

This commit does not remove any data from the DB itself.  That would
require a migration, which we will implement in a different commit.
We'll also need one more commit to deprecate the histograms.

BUG=124140

Review URL: https://chromiumcodereview.appspot.com/12087010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179247 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 7 deletions

diff --git a/sync/syncable/syncable_unittest.cc b/sync/syncable/syncable_unittest.cc
index b6f767a..7eb0adc 100644
--- a/sync/syncable/syncable_unittest.cc
+++ b/sync/syncable/syncable_unittest.cc
@@ -1749,7 +1749,6 @@ TEST_F(OnDiskSyncableDirectoryTest, TestPurgeEntriesWithTypeIn) {
 
 TEST_F(OnDiskSyncableDirectoryTest, TestShareInfo) {
   dir_->set_store_birthday("Jan 31st");
-  dir_->SetNotificationState("notification_state");
   const char* const bag_of_chips_array = "\0bag of chips";
   const std::string bag_of_chips_string =
       std::string(bag_of_chips_array, sizeof(bag_of_chips_array));
@@ -1757,11 +1756,9 @@ TEST_F(OnDiskSyncableDirectoryTest, TestShareInfo) {
   {
     ReadTransaction trans(FROM_HERE, dir_.get());
     EXPECT_EQ("Jan 31st", dir_->store_birthday());
-    EXPECT_EQ("notification_state", dir_->GetNotificationState());
     EXPECT_EQ(bag_of_chips_string, dir_->bag_of_chips());
   }
   dir_->set_store_birthday("April 10th");
-  dir_->SetNotificationState("notification_state2");
   const char* const bag_of_chips2_array = "\0bag of chips2";
   const std::string bag_of_chips2_string =
       std::string(bag_of_chips2_array, sizeof(bag_of_chips2_array));
@@ -1770,17 +1767,18 @@ TEST_F(OnDiskSyncableDirectoryTest, TestShareInfo) {
   {
     ReadTransaction trans(FROM_HERE, dir_.get());
     EXPECT_EQ("April 10th", dir_->store_birthday());
-    EXPECT_EQ("notification_state2", dir_->GetNotificationState());
     EXPECT_EQ(bag_of_chips2_string, dir_->bag_of_chips());
   }
-  dir_->SetNotificationState("notification_state2");
+  const char* const bag_of_chips3_array = "\0bag of chips3";
+  const std::string bag_of_chips3_string =
+      std::string(bag_of_chips3_array, sizeof(bag_of_chips3_array));
+  dir_->set_bag_of_chips(bag_of_chips3_string);
   // Restore the directory from disk.  Make sure that nothing's changed.
   SaveAndReloadDir();
   {
     ReadTransaction trans(FROM_HERE, dir_.get());
     EXPECT_EQ("April 10th", dir_->store_birthday());
-    EXPECT_EQ("notification_state2", dir_->GetNotificationState());
-    EXPECT_EQ(bag_of_chips2_string, dir_->bag_of_chips());
+    EXPECT_EQ(bag_of_chips3_string, dir_->bag_of_chips());
   }
 }