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

20 files changed, 18 insertions, 197 deletions

diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
index 72f096f..2193945 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -417,23 +417,12 @@ void SyncManagerImpl::Init(
   connection_manager_->set_client_id(directory()->cache_guid());
   connection_manager_->AddListener(this);
 
-  // Retrieve and set the sync notifier state.
+  // Retrieve and set the sync notifier id.
   std::string unique_id = directory()->cache_guid();
   DVLOG(1) << "Read notification unique ID: " << unique_id;
   allstatus_.SetUniqueId(unique_id);
   invalidator_->SetUniqueId(unique_id);
 
-  std::string state = directory()->GetNotificationState();
-  if (VLOG_IS_ON(1)) {
-    std::string encoded_state;
-    base::Base64Encode(state, &encoded_state);
-    DVLOG(1) << "Read notification state: " << encoded_state;
-  }
-
-  // TODO(tim): Remove once invalidation state has been migrated to new
-  // InvalidationStateTracker store. Bug 124140.
-  invalidator_->SetStateDeprecated(state);
-
   // Build a SyncSessionContext and store the worker in it.
   DVLOG(1) << "Sync is bringing up SyncSessionContext.";
   std::vector<SyncEngineEventListener*> listeners;
diff --git a/sync/notifier/fake_invalidator.cc b/sync/notifier/fake_invalidator.cc
index 1a99819..52189d3 100644
--- a/sync/notifier/fake_invalidator.cc
+++ b/sync/notifier/fake_invalidator.cc
@@ -23,10 +23,6 @@ const std::string& FakeInvalidator::GetUniqueId() const {
   return unique_id_;
 }
 
-const std::string& FakeInvalidator::GetStateDeprecated() const {
-  return state_;
-}
-
 const std::string& FakeInvalidator::GetCredentialsEmail() const {
   return email_;
 }
@@ -71,10 +67,6 @@ void FakeInvalidator::SetUniqueId(const std::string& unique_id) {
   unique_id_ = unique_id;
 }
 
-void FakeInvalidator::SetStateDeprecated(const std::string& state) {
-  state_ = state;
-}
-
 void FakeInvalidator::UpdateCredentials(
     const std::string& email, const std::string& token) {
   email_ = email;
diff --git a/sync/notifier/fake_invalidator.h b/sync/notifier/fake_invalidator.h
index b65fcea..fa566dc 100644
--- a/sync/notifier/fake_invalidator.h
+++ b/sync/notifier/fake_invalidator.h
@@ -22,7 +22,6 @@ class FakeInvalidator : public Invalidator {
   bool IsHandlerRegistered(InvalidationHandler* handler) const;
   ObjectIdSet GetRegisteredIds(InvalidationHandler* handler) const;
   const std::string& GetUniqueId() const;
-  const std::string& GetStateDeprecated() const;
   const std::string& GetCredentialsEmail() const;
   const std::string& GetCredentialsToken() const;
   const ObjectIdInvalidationMap& GetLastSentInvalidationMap() const;
@@ -38,7 +37,6 @@ class FakeInvalidator : public Invalidator {
   virtual void UnregisterHandler(InvalidationHandler* handler) OVERRIDE;
   virtual InvalidatorState GetInvalidatorState() const OVERRIDE;
   virtual void SetUniqueId(const std::string& unique_id) OVERRIDE;
-  virtual void SetStateDeprecated(const std::string& state) OVERRIDE;
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) OVERRIDE;
   virtual void SendInvalidation(
diff --git a/sync/notifier/fake_invalidator_unittest.cc b/sync/notifier/fake_invalidator_unittest.cc
index e94f60b..ee7ef41 100644
--- a/sync/notifier/fake_invalidator_unittest.cc
+++ b/sync/notifier/fake_invalidator_unittest.cc
@@ -50,10 +50,6 @@ class FakeInvalidatorTestDelegate {
     invalidator_->EmitOnIncomingInvalidation(invalidation_map, source);
   }
 
-  static bool InvalidatorHandlesDeprecatedState() {
-    return false;
-  }
-
  private:
   scoped_ptr<FakeInvalidator> invalidator_;
 };
diff --git a/sync/notifier/invalidation_notifier.cc b/sync/notifier/invalidation_notifier.cc
index 93417e2..bd49426 100644
--- a/sync/notifier/invalidation_notifier.cc
+++ b/sync/notifier/invalidation_notifier.cc
@@ -64,26 +64,6 @@ void InvalidationNotifier::SetUniqueId(const std::string& unique_id) {
   CHECK(!client_id_.empty());
 }
 
-void InvalidationNotifier::SetStateDeprecated(const std::string& state) {
-  DCHECK(CalledOnValidThread());
-  DCHECK_LT(state_, STARTED);
-  if (invalidation_bootstrap_data_.empty()) {
-    // Migrate state from sync to invalidation state tracker (bug
-    // 124140).  We've just been handed state from the syncable::Directory, and
-    // the initial invalidation state was empty, implying we've never written
-    // to the new store. Do this here to ensure we always migrate (even if
-    // we fail to establish an initial connection or receive an initial
-    // invalidation) so that we can make the old code obsolete as soon as
-    // possible.
-    invalidation_bootstrap_data_ = state;
-    invalidation_state_tracker_.Call(
-        FROM_HERE, &InvalidationStateTracker::SetBootstrapData, state);
-    UMA_HISTOGRAM_BOOLEAN("InvalidationNotifier.UsefulSetState", true);
-  } else {
-    UMA_HISTOGRAM_BOOLEAN("InvalidationNotifier.UsefulSetState", false);
-  }
-}
-
 void InvalidationNotifier::UpdateCredentials(
     const std::string& email, const std::string& token) {
   if (state_ == STOPPED) {
@@ -93,7 +73,6 @@ void InvalidationNotifier::UpdateCredentials(
         initial_invalidation_state_map_,
         invalidation_state_tracker_,
         this);
-    invalidation_bootstrap_data_.clear();
     state_ = STARTED;
   }
   invalidation_listener_.UpdateCredentials(email, token);
diff --git a/sync/notifier/invalidation_notifier.h b/sync/notifier/invalidation_notifier.h
index 0942364..aac30dc 100644
--- a/sync/notifier/invalidation_notifier.h
+++ b/sync/notifier/invalidation_notifier.h
@@ -57,7 +57,6 @@ class SYNC_EXPORT_PRIVATE InvalidationNotifier
   virtual void UnregisterHandler(InvalidationHandler* handler) OVERRIDE;
   virtual InvalidatorState GetInvalidatorState() const OVERRIDE;
   virtual void SetUniqueId(const std::string& unique_id) OVERRIDE;
-  virtual void SetStateDeprecated(const std::string& state) OVERRIDE;
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) OVERRIDE;
   virtual void SendInvalidation(
@@ -96,9 +95,7 @@ class SYNC_EXPORT_PRIVATE InvalidationNotifier
   std::string client_id_;
 
   // The initial bootstrap data to pass to |invalidation_listener_|.
-  // TODO(tim): This should be made const once migration is completed for bug
-  // 124140.
-  std::string invalidation_bootstrap_data_;
+  const std::string invalidation_bootstrap_data_;
 
   // The invalidation listener.
   SyncInvalidationListener invalidation_listener_;
diff --git a/sync/notifier/invalidation_notifier_unittest.cc b/sync/notifier/invalidation_notifier_unittest.cc
index 2ceb509..a63a56a 100644
--- a/sync/notifier/invalidation_notifier_unittest.cc
+++ b/sync/notifier/invalidation_notifier_unittest.cc
@@ -75,10 +75,6 @@ class InvalidationNotifierTestDelegate {
     invalidator_->OnInvalidate(invalidation_map);
   }
 
-  static bool InvalidatorHandlesDeprecatedState() {
-    return true;
-  }
-
  private:
   MessageLoop message_loop_;
   scoped_ptr<InvalidationNotifier> invalidator_;
diff --git a/sync/notifier/invalidator.h b/sync/notifier/invalidator.h
index 4d84b91..0c2b311 100644
--- a/sync/notifier/invalidator.h
+++ b/sync/notifier/invalidator.h
@@ -79,11 +79,6 @@ class SYNC_EXPORT Invalidator {
   // unique string.
   virtual void SetUniqueId(const std::string& unique_id) = 0;
 
-  // SetState must be called once, before any call to
-  // UpdateCredentials.  |state| may be empty.
-  // Deprecated in favour of InvalidationStateTracker persistence.
-  virtual void SetStateDeprecated(const std::string& state) = 0;
-
   // The observers won't be notified of any notifications until
   // UpdateCredentials is called at least once. It can be called more than
   // once.
diff --git a/sync/notifier/invalidator_registrar_unittest.cc b/sync/notifier/invalidator_registrar_unittest.cc
index 00f04e2..a69beae 100644
--- a/sync/notifier/invalidator_registrar_unittest.cc
+++ b/sync/notifier/invalidator_registrar_unittest.cc
@@ -51,10 +51,6 @@ class RegistrarInvalidator : public Invalidator {
     // Do nothing.
   }
 
-  virtual void SetStateDeprecated(const std::string& state) OVERRIDE {
-    // Do nothing.
-  }
-
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) OVERRIDE {
     // Do nothing.
@@ -110,10 +106,6 @@ class RegistrarInvalidatorTestDelegate {
         invalidation_map, source);
   }
 
-  static bool InvalidatorHandlesDeprecatedState() {
-    return false;
-  }
-
  private:
   scoped_ptr<RegistrarInvalidator> invalidator_;
 };
diff --git a/sync/notifier/invalidator_test_template.h b/sync/notifier/invalidator_test_template.h
index fdae55b..44a288d 100644
--- a/sync/notifier/invalidator_test_template.h
+++ b/sync/notifier/invalidator_test_template.h
@@ -36,9 +36,9 @@
 //       ...
 //     }
 //
-//     // Called after a call to SetStateDeprecated(), SetUniqueId(), or
-//     // UpdateCredentials() on the Invalidator implementation.  Should block
-//     // until the effects of the call are visible on the current thread.
+//     // Called after a call to SetUniqueId(), or UpdateCredentials() on the
+//     // Invalidator implementation.  Should block until the effects of the
+//     // call are visible on the current thread.
 //     void WaitForInvalidator() {
 //       ...
 //     }
@@ -61,12 +61,6 @@
 //         IncomingInvalidationSource source) {
 //       ...
 //     }
-//
-//     // Returns whether or not the notifier handles storing the old
-//     // (deprecated) notifier state.
-//     static bool InvalidatorHandlesDeprecatedState() {
-//       return false;
-//     }
 //   };
 //
 // The InvalidatorTest test harness will have a member variable of
@@ -112,13 +106,6 @@ class InvalidatorTest : public testing::Test {
                                       this->fake_tracker_.AsWeakPtr());
     Invalidator* const invalidator = this->delegate_.GetInvalidator();
 
-    // TODO(tim): This call should be a no-op. Remove once bug 124140 and
-    // associated issues are fixed.
-    invalidator->SetStateDeprecated("fake_state");
-    this->delegate_.WaitForInvalidator();
-    // We don't expect |fake_tracker_|'s bootstrap data to change, as we
-    // initialized with a non-empty value previously.
-    EXPECT_TRUE(this->fake_tracker_.GetBootstrapData().empty());
     invalidator->SetUniqueId("fake_id");
     this->delegate_.WaitForInvalidator();
     invalidator->UpdateCredentials("foo@bar.com", "fake_token");
@@ -385,45 +372,9 @@ TYPED_TEST_P(InvalidatorTest, GetInvalidatorStateAlwaysCurrent) {
   invalidator->UnregisterHandler(&handler);
 }
 
-// Initialize the invalidator with no bootstrap data.  Call the deprecated
-// state setter function a number of times, destroying and re-creating the
-// invalidator in between.  Only the first one should take effect (i.e.,
-// migration of bootstrap data should only happen once)
-TYPED_TEST_P(InvalidatorTest, MigrateState) {
-  if (!this->delegate_.InvalidatorHandlesDeprecatedState()) {
-    DLOG(INFO) << "This Invalidator doesn't handle deprecated state; "
-               << "skipping";
-    return;
-  }
-
-  this->delegate_.CreateInvalidator(std::string(),
-                                    this->fake_tracker_.AsWeakPtr());
-  Invalidator* invalidator = this->delegate_.GetInvalidator();
-
-  invalidator->SetStateDeprecated("fake_state");
-  this->delegate_.WaitForInvalidator();
-  EXPECT_EQ("fake_state", this->fake_tracker_.GetBootstrapData());
-
-  // Should do nothing.
-  invalidator->SetStateDeprecated("spurious_fake_state");
-  this->delegate_.WaitForInvalidator();
-  EXPECT_EQ("fake_state", this->fake_tracker_.GetBootstrapData());
-
-  // Pretend that Chrome has shut down.
-  this->delegate_.DestroyInvalidator();
-  this->delegate_.CreateInvalidator("fake_state",
-                                    this->fake_tracker_.AsWeakPtr());
-  invalidator = this->delegate_.GetInvalidator();
-
-  // Should do nothing.
-  invalidator->SetStateDeprecated("more_spurious_fake_state");
-  this->delegate_.WaitForInvalidator();
-  EXPECT_EQ("fake_state", this->fake_tracker_.GetBootstrapData());
-}
-
 REGISTER_TYPED_TEST_CASE_P(InvalidatorTest,
                            Basic, MultipleHandlers, EmptySetUnregisters,
-                           GetInvalidatorStateAlwaysCurrent, MigrateState);
+                           GetInvalidatorStateAlwaysCurrent);
 
 }  // namespace syncer
 
diff --git a/sync/notifier/non_blocking_invalidator.cc b/sync/notifier/non_blocking_invalidator.cc
index 47aa53f..5ff8dfa 100644
--- a/sync/notifier/non_blocking_invalidator.cc
+++ b/sync/notifier/non_blocking_invalidator.cc
@@ -37,7 +37,6 @@ class NonBlockingInvalidator::Core
   void Teardown();
   void UpdateRegisteredIds(const ObjectIdSet& ids);
   void SetUniqueId(const std::string& unique_id);
-  void SetStateDeprecated(const std::string& state);
   void UpdateCredentials(const std::string& email, const std::string& token);
 
   // InvalidationHandler implementation (all called on I/O thread by
@@ -109,12 +108,6 @@ void NonBlockingInvalidator::Core::SetUniqueId(const std::string& unique_id) {
   invalidation_notifier_->SetUniqueId(unique_id);
 }
 
-void NonBlockingInvalidator::Core::SetStateDeprecated(
-    const std::string& state) {
-  DCHECK(network_task_runner_->BelongsToCurrentThread());
-  invalidation_notifier_->SetStateDeprecated(state);
-}
-
 void NonBlockingInvalidator::Core::UpdateCredentials(const std::string& email,
                                                      const std::string& token) {
   DCHECK(network_task_runner_->BelongsToCurrentThread());
@@ -215,17 +208,6 @@ void NonBlockingInvalidator::SetUniqueId(const std::string& unique_id) {
   }
 }
 
-void NonBlockingInvalidator::SetStateDeprecated(const std::string& state) {
-  DCHECK(parent_task_runner_->BelongsToCurrentThread());
-  if (!network_task_runner_->PostTask(
-          FROM_HERE,
-          base::Bind(
-              &NonBlockingInvalidator::Core::SetStateDeprecated,
-              core_.get(), state))) {
-    NOTREACHED();
-  }
-}
-
 void NonBlockingInvalidator::UpdateCredentials(const std::string& email,
                                                const std::string& token) {
   DCHECK(parent_task_runner_->BelongsToCurrentThread());
diff --git a/sync/notifier/non_blocking_invalidator.h b/sync/notifier/non_blocking_invalidator.h
index b2be5d4..a35b42a 100644
--- a/sync/notifier/non_blocking_invalidator.h
+++ b/sync/notifier/non_blocking_invalidator.h
@@ -53,7 +53,6 @@ class SYNC_EXPORT_PRIVATE NonBlockingInvalidator
   virtual void UnregisterHandler(InvalidationHandler* handler) OVERRIDE;
   virtual InvalidatorState GetInvalidatorState() const OVERRIDE;
   virtual void SetUniqueId(const std::string& unique_id) OVERRIDE;
-  virtual void SetStateDeprecated(const std::string& state) OVERRIDE;
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) OVERRIDE;
   virtual void SendInvalidation(
diff --git a/sync/notifier/non_blocking_invalidator_unittest.cc b/sync/notifier/non_blocking_invalidator_unittest.cc
index 05d9f63..c6ddf0f 100644
--- a/sync/notifier/non_blocking_invalidator_unittest.cc
+++ b/sync/notifier/non_blocking_invalidator_unittest.cc
@@ -84,10 +84,6 @@ class NonBlockingInvalidatorTestDelegate {
     invalidator_->OnIncomingInvalidation(invalidation_map, source);
   }
 
-  static bool InvalidatorHandlesDeprecatedState() {
-    return true;
-  }
-
  private:
   MessageLoop message_loop_;
   base::Thread io_thread_;
diff --git a/sync/notifier/p2p_invalidator.cc b/sync/notifier/p2p_invalidator.cc
index adf6010..d04a191 100644
--- a/sync/notifier/p2p_invalidator.cc
+++ b/sync/notifier/p2p_invalidator.cc
@@ -210,11 +210,6 @@ void P2PInvalidator::SetUniqueId(const std::string& unique_id) {
   unique_id_ = unique_id;
 }
 
-void P2PInvalidator::SetStateDeprecated(const std::string& state) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  // Do nothing.
-}
-
 void P2PInvalidator::UpdateCredentials(
     const std::string& email, const std::string& token) {
   DCHECK(thread_checker_.CalledOnValidThread());
diff --git a/sync/notifier/p2p_invalidator.h b/sync/notifier/p2p_invalidator.h
index 9bb28a5..d3faa66 100644
--- a/sync/notifier/p2p_invalidator.h
+++ b/sync/notifier/p2p_invalidator.h
@@ -109,7 +109,6 @@ class SYNC_EXPORT_PRIVATE P2PInvalidator
   virtual void UnregisterHandler(InvalidationHandler* handler) OVERRIDE;
   virtual InvalidatorState GetInvalidatorState() const OVERRIDE;
   virtual void SetUniqueId(const std::string& unique_id) OVERRIDE;
-  virtual void SetStateDeprecated(const std::string& state) OVERRIDE;
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) OVERRIDE;
   virtual void SendInvalidation(
diff --git a/sync/notifier/p2p_invalidator_unittest.cc b/sync/notifier/p2p_invalidator_unittest.cc
index e8a1b86..577630f 100644
--- a/sync/notifier/p2p_invalidator_unittest.cc
+++ b/sync/notifier/p2p_invalidator_unittest.cc
@@ -75,10 +75,6 @@ class P2PInvalidatorTestDelegate {
     fake_push_client_->SimulateIncomingNotification(notification);
   }
 
-  static bool InvalidatorHandlesDeprecatedState() {
-    return false;
-  }
-
  private:
   // Owned by |invalidator_|.
   notifier::FakePushClient* fake_push_client_;
diff --git a/sync/syncable/directory.cc b/sync/syncable/directory.cc
index 7b58364..f4eac2d 100644
--- a/sync/syncable/directory.cc
+++ b/sync/syncable/directory.cc
@@ -736,14 +736,6 @@ template <class T> void Directory::TestAndSet(
   }
 }
 
-void Directory::SetNotificationStateUnsafe(
-    const std::string& notification_state) {
-  if (notification_state == kernel_->persisted_info.notification_state)
-    return;
-  kernel_->persisted_info.notification_state = notification_state;
-  kernel_->info_status = KERNEL_SHARE_INFO_DIRTY;
-}
-
 string Directory::store_birthday() const {
   ScopedKernelLock lock(this);
   return kernel_->persisted_info.store_birthday;
@@ -770,16 +762,6 @@ void Directory::set_bag_of_chips(const string& bag_of_chips) {
   kernel_->info_status = KERNEL_SHARE_INFO_DIRTY;
 }
 
-std::string Directory::GetNotificationState() const {
-  ScopedKernelLock lock(this);
-  std::string notification_state = kernel_->persisted_info.notification_state;
-  return notification_state;
-}
-
-void Directory::SetNotificationState(const std::string& notification_state) {
-  ScopedKernelLock lock(this);
-  SetNotificationStateUnsafe(notification_state);
-}
 
 string Directory::cache_guid() const {
   // No need to lock since nothing ever writes to it after load.
diff --git a/sync/syncable/directory.h b/sync/syncable/directory.h
index f55ba4e..b54b0cc 100644
--- a/sync/syncable/directory.h
+++ b/sync/syncable/directory.h
@@ -168,8 +168,6 @@ class SYNC_EXPORT Directory {
     std::string store_birthday;
     // The next local ID that has not been used with this cache-GUID.
     int64 next_id;
-    // The persisted notification state.
-    std::string notification_state;
     // The serialized bag of chips we were given by the server. Contents are
     // opaque to the client. This is the serialization of a message of type
     // ChipBag defined in sync.proto. It can contains NULL characters.
@@ -276,9 +274,6 @@ class SYNC_EXPORT Directory {
   std::string bag_of_chips() const;
   void set_bag_of_chips(const std::string& bag_of_chips);
 
-  std::string GetNotificationState() const;
-  void SetNotificationState(const std::string& notification_state);
-
   // Unique to each account / client pair.
   std::string cache_guid() const;
 
@@ -488,11 +483,6 @@ class SYNC_EXPORT Directory {
   bool SafeToPurgeFromMemory(WriteTransaction* trans,
                              const EntryKernel* const entry) const;
 
-  // Internal setters that do not acquire a lock internally.  These are unsafe
-  // on their own; caller must guarantee exclusive access manually by holding
-  // a ScopedKernelLock.
-  void SetNotificationStateUnsafe(const std::string& notification_state);
-
   Directory& operator = (const Directory&);
 
  public:
diff --git a/sync/syncable/directory_backing_store.cc b/sync/syncable/directory_backing_store.cc
index 442c9e7..a2069a9 100644
--- a/sync/syncable/directory_backing_store.cc
+++ b/sync/syncable/directory_backing_store.cc
@@ -247,13 +247,10 @@ bool DirectoryBackingStore::SaveChanges(
             "UPDATE share_info "
             "SET store_birthday = ?, "
             "next_id = ?, "
-            "notification_state = ?, "
             "bag_of_chips = ?"));
     s1.BindString(0, info.store_birthday);
     s1.BindInt64(1, info.next_id);
-    s1.BindBlob(2, info.notification_state.data(),
-                   info.notification_state.size());
-    s1.BindBlob(3, info.bag_of_chips.data(), info.bag_of_chips.size());
+    s1.BindBlob(2, info.bag_of_chips.data(), info.bag_of_chips.size());
 
     if (!s1.Run())
       return false;
@@ -470,6 +467,7 @@ bool DirectoryBackingStore::RefreshColumns() {
   if (!CreateShareInfoTable(true))
     return false;
 
+  // TODO(rlarocque, 124140): Remove notification_state.
   if (!db_->Execute(
           "INSERT INTO temp_share_info (id, name, store_birthday, "
           "db_create_version, db_create_time, next_id, cache_guid,"
@@ -501,8 +499,7 @@ bool DirectoryBackingStore::LoadInfo(Directory::KernelLoadInfo* info) {
   {
     sql::Statement s(
         db_->GetUniqueStatement(
-            "SELECT store_birthday, next_id, cache_guid, notification_state, "
-            "bag_of_chips "
+            "SELECT store_birthday, next_id, cache_guid, bag_of_chips "
             "FROM share_info"));
     if (!s.Step())
       return false;
@@ -510,8 +507,7 @@ bool DirectoryBackingStore::LoadInfo(Directory::KernelLoadInfo* info) {
     info->kernel_info.store_birthday = s.ColumnString(0);
     info->kernel_info.next_id = s.ColumnInt64(1);
     info->cache_guid = s.ColumnString(2);
-    s.ColumnBlobAsString(3, &(info->kernel_info.notification_state));
-    s.ColumnBlobAsString(4, &(info->kernel_info.bag_of_chips));
+    s.ColumnBlobAsString(3, &(info->kernel_info.bag_of_chips));
 
     // Verify there was only one row returned.
     DCHECK(!s.Step());
@@ -1136,6 +1132,7 @@ bool DirectoryBackingStore::CreateTables() {
             "?, "   // db_create_time
             "-2, "  // next_id
             "?, "   // cache_guid
+            // TODO(rlarocque, 124140): Remove notification_state field.
             "?, "   // notification_state
             "?);"));  // bag_of_chips
     s.BindString(0, dir_name_);                   // id
@@ -1146,6 +1143,7 @@ bool DirectoryBackingStore::CreateTables() {
     s.BindString(3, "Unknown");                   // db_create_version
     s.BindInt(4, static_cast<int32>(time(0)));    // db_create_time
     s.BindString(5, GenerateCacheGUID());         // cache_guid
+    // TODO(rlarocque, 124140): Remove this unused notification-state field.
     s.BindBlob(6, NULL, 0);                       // notification_state
     s.BindBlob(7, NULL, 0);                       // bag_of_chips
     if (!s.Run())
@@ -1247,6 +1245,7 @@ bool DirectoryBackingStore::CreateShareInfoTable(bool is_temporary) {
       "db_create_time INT, "
       "next_id INT default -2, "
       "cache_guid TEXT, "
+      // TODO(rlarocque, 124140): Remove notification_state field.
       "notification_state BLOB, "
       "bag_of_chips BLOB"
       ")");
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());
   }
 }