Fix document mode migration.

Fix document mode migration.

There is an old tab_state file in the tabbed mode state directory. If
it is not deleted and the new tab state is written to the new
tab_state0 file, then when it comes time to run the migration code in
TabPersistentStore the old tab_state file will be given preference
and overwrite the new one with all the document mode tabs that were
just migrated. Thus we need to delete the old tab_state file if it
exists.

BUG=640625
Committed: https://crrev.com/9df9c7815b45e142c29162e02ddcdd8f411ec703
Cr-Commit-Position: refs/heads/master@{#414194}

[Peter Wen, 2016-08-24 16:37:51]

The CQ bit was checked by wnwen@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-08-24 16:38:18]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Peter Wen, 2016-08-24 16:39:18]

The CQ bit was checked by wnwen@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-08-24 16:39:28]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Peter Wen, 2016-08-24 16:43:26]

wnwen@chromium.org changed reviewers:
+ dfalcantara@chromium.org, twellington@chromium.org

[Peter Wen, 2016-08-24 16:43:27]

Going to be out this afternoon, will respond to comments tomorrow. :)

[commit-bot: I haz the power, 2016-08-24 17:44:13]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-24 17:44:14]

Dry run: Try jobs failed on following builders:
  android_clang_dbg_recipe on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/android_clan...)

[gone, 2016-08-24 18:34:45]

lgtm

https://chromiumcodereview.appspot.com/2274943002/diff/20001/chrome/android/j...
File
chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.java
(right):

https://chromiumcodereview.appspot.com/2274943002/diff/20001/chrome/android/j...
chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.java:125:
private final ObserverList<DocumentModeAssassinObserver> mObservers =
does this fit on one line now?

https://chromiumcodereview.appspot.com/2274943002/diff/20001/chrome/android/j...
chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.java:351:
getTabbedDataDirectory(), TabPersistentStore.SAVED_STATE_FILE);
For sanity's sake, it seems that we should do this before saving the new list
out.  We should probably also add a separate set of fields:

/** <M54: TabModel metadata Files used to be named this blah blah. */
TabPersistentStore#LEGACY_SAVED_STATE_FILE = "tab_state"

/** >=M54: New TabModel metadata filenames are prefixed with this and then the
index of the selector. */
TabPersistentStore#SAVED_STATE_BASE = "tab_state"

[Peter Wen, 2016-08-24 21:56:40]

https://chromiumcodereview.appspot.com/2274943002/diff/20001/chrome/android/j...
File
chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.java
(right):

https://chromiumcodereview.appspot.com/2274943002/diff/20001/chrome/android/j...
chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.java:125:
private final ObserverList<DocumentModeAssassinObserver> mObservers =
On 2016/08/24 18:34:45, dfalcantara wrote:
> does this fit on one line now?

Done.

https://chromiumcodereview.appspot.com/2274943002/diff/20001/chrome/android/j...
chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.java:351:
getTabbedDataDirectory(), TabPersistentStore.SAVED_STATE_FILE);
On 2016/08/24 18:34:45, dfalcantara wrote:
> For sanity's sake, it seems that we should do this before saving the new list
> out.  We should probably also add a separate set of fields:
> 
> /** <M54: TabModel metadata Files used to be named this blah blah. */
> TabPersistentStore#LEGACY_SAVED_STATE_FILE = "tab_state"
> 
> /** >=M54: New TabModel metadata filenames are prefixed with this and then the
> index of the selector. */
> TabPersistentStore#SAVED_STATE_BASE = "tab_state"

Changed order to delete first.

For easier merging into M53, I'll do the renaming in a follow-up CL.

[Peter Wen, 2016-08-24 21:56:44]

The CQ bit was checked by wnwen@chromium.org

[Peter Wen, 2016-08-24 21:56:45]

The patchset sent to the CQ was uploaded after l-g-t-m from
dfalcantara@chromium.org
Link to the patchset: https://chromiumcodereview.appspot.com/2274943002/#ps40001
(title: "Switch order.")

[commit-bot: I haz the power, 2016-08-24 21:57:25]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Theresa, 2016-08-24 22:04:41]

lgtm

[commit-bot: I haz the power, 2016-08-24 23:21:29]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2016-08-24 23:22:50]

Description was changed from

==========
Fix document mode migration.

There is an old tab_state file in the tabbed mode state directory. If
it is not deleted and the new tab state is written to the new
tab_state0 file, then when it comes time to run the migration code in
TabPersistentStore the old tab_state file will be given preference
and overwrite the new one with all the document mode tabs that were
just migrated. Thus we need to delete the old tab_state file if it
exists.

BUG=640625
==========

to

==========
Fix document mode migration.

There is an old tab_state file in the tabbed mode state directory. If
it is not deleted and the new tab state is written to the new
tab_state0 file, then when it comes time to run the migration code in
TabPersistentStore the old tab_state file will be given preference
and overwrite the new one with all the document mode tabs that were
just migrated. Thus we need to delete the old tab_state file if it
exists.

BUG=640625

Committed: https://crrev.com/9df9c7815b45e142c29162e02ddcdd8f411ec703
Cr-Commit-Position: refs/heads/master@{#414194}
==========

[commit-bot: I haz the power, 2016-08-24 23:22:51]

Patchset 3 (id:??) landed as
https://crrev.com/9df9c7815b45e142c29162e02ddcdd8f411ec703
Cr-Commit-Position: refs/heads/master@{#414194}