Move encryption related files from util folder to encryption folder.

Move encryption related files from util folder to encryption folder.


BUG=103336
TEST=

[lipalani1, 2011-11-15 22:43:14]

One of the synccodecleanup bugs. Moves the encryption related files in util to
its own top level folder.

[tim (not reviewing), 2011-11-16 17:58:49]

http://codereview.chromium.org/8468023/diff/2001/chrome/browser/sync/engine/n...
File chrome/browser/sync/engine/nigori_util.cc (left):

http://codereview.chromium.org/8468023/diff/2001/chrome/browser/sync/engine/n...
chrome/browser/sync/engine/nigori_util.cc:11: #include
"chrome/browser/sync/engine/syncer_util.h"
should this file also move to /encryption?

[Nicolas Zea, 2011-11-16 23:35:47]

I had no idea those data_encryptor  and user_settings files existed. As best I
can tell we no longer actually use user_settings anywhere, and that was the only
sync code that used the data_encryptor (Tim, is that right?).

Given that, and given that autofill now appears to be the only thing using the
data_encryptor (assuming that they actually use it to), we should probably just
delete the UserSettings files and move the data_encryptor to the autofill
folder.

http://codereview.chromium.org/8468023/diff/2001/chrome/browser/sync/abstract...
File chrome/browser/sync/abstract_profile_sync_service_test.cc (right):

http://codereview.chromium.org/8468023/diff/2001/chrome/browser/sync/abstract...
chrome/browser/sync/abstract_profile_sync_service_test.cc:14: #include
"chrome/browser/sync/encryption/cryptographer.h"
move this to top of sync/* includes to keep alphabetical order (here and in all
other files).

http://codereview.chromium.org/8468023/diff/2001/chrome/browser/sync/engine/n...
File chrome/browser/sync/engine/nigori_util.cc (left):

http://codereview.chromium.org/8468023/diff/2001/chrome/browser/sync/engine/n...
chrome/browser/sync/engine/nigori_util.cc:11: #include
"chrome/browser/sync/engine/syncer_util.h"
On 2011/11/16 17:58:49, timsteele wrote:
> should this file also move to /encryption?
agreed

[Ilya Sherman, 2011-11-16 23:56:19]

On 2011/11/16 23:35:47, nzea wrote:
> Given that, and given that autofill now appears to be the only thing using the
> data_encryptor (assuming that they actually use it to), we should probably
just
> delete the UserSettings files and move the data_encryptor to the autofill
> folder.

Where does Autofill use this?  Is there something newer that the Autofill code
should be using instead?

[Nicolas Zea, 2011-11-16 23:58:06]

There's a DecryptData call in the autofill_ie_toolbar_import_win.cc, which I
believe comes from data_encryption.h. Is that code still in use?

[tim (not reviewing), 2011-11-17 00:37:55]

Whoa!!! UserSettings! What a blast from the past. 
We've removed the TokenMigrator which was the last thing that would have made
use of UserSettings, which was deprecated as of
http://codereview.chromium.org/3305003.  So yeah, we should yank that file

[lipalani1, 2011-11-17 19:10:55]

Please review. 

If there are not much of an objection I will file a seperate bug to remove the
autofill file.

[tim (not reviewing), 2011-11-17 19:48:43]

Please make sure you track the UserSettings removal as well.

LGTM!

[Nicolas Zea, 2011-11-17 21:04:30]

LGTM once nits addressed.

http://codereview.chromium.org/8468023/diff/1041/chrome/browser/sync/encrypti...
File chrome/browser/sync/encryption/DEPS (right):

http://codereview.chromium.org/8468023/diff/1041/chrome/browser/sync/encrypti...
chrome/browser/sync/encryption/DEPS:5: "++chrome/browser/sync/internal_api",
++?

http://codereview.chromium.org/8468023/diff/1041/chrome/browser/sync/encrypti...
File chrome/browser/sync/encryption/cryptographer.h (right):

http://codereview.chromium.org/8468023/diff/1041/chrome/browser/sync/encrypti...
chrome/browser/sync/encryption/cryptographer.h:18: #include
"chrome/browser/sync/encryption/nigori.h"
This #include and others in the patch are not in alphabetical order.

http://codereview.chromium.org/8468023/diff/1041/chrome/browser/sync/encrypti...
File chrome/browser/sync/encryption/nigori_util.cc (right):

http://codereview.chromium.org/8468023/diff/1041/chrome/browser/sync/encrypti...
chrome/browser/sync/encryption/nigori_util.cc:41:
entry.Get(syncable::SPECIFICS),
indent by one more space.

http://codereview.chromium.org/8468023/diff/1041/chrome/browser/sync/encrypti...
chrome/browser/sync/encryption/nigori_util.cc:80:
entry.Get(syncable::NON_UNIQUE_NAME) != kEncryptedString);
rewrite as:
  return SpecificsNeedsEncryption(
      encrypted_types,
      entry.Get(syncable::SPECIFICS)) || encrypted_types.count(type) > 0 &&
          entry.Get(NON_UNIQUE_NAME) != kEncryptedString);

http://codereview.chromium.org/8468023/diff/1041/chrome/browser/sync/encrypti...
chrome/browser/sync/encryption/nigori_util.cc:99: if (type ==
syncable::PASSWORDS || type == syncable::NIGORI) {
unindent this line

http://codereview.chromium.org/8468023/diff/1041/chrome/browser/sync/encrypti...
File chrome/browser/sync/encryption/nigori_util.h (right):

http://codereview.chromium.org/8468023/diff/1041/chrome/browser/sync/encrypti...
chrome/browser/sync/encryption/nigori_util.h:35: // Check if our unsyced changes
are encrypted if they need to be based on
unsyced -> unsynced

http://codereview.chromium.org/8468023/diff/1041/chrome/browser/sync/encrypti...
chrome/browser/sync/encryption/nigori_util.h:69: }  // namespace browser_sync
newline after

[tim (not reviewing), 2011-12-09 23:13:24]

On 2011/11/17 21:04:30, nzea wrote:
> LGTM once nits addressed.
> 
>
http://codereview.chromium.org/8468023/diff/1041/chrome/browser/sync/encrypti...
> File chrome/browser/sync/encryption/DEPS (right):
> 
>
http://codereview.chromium.org/8468023/diff/1041/chrome/browser/sync/encrypti...
> chrome/browser/sync/encryption/DEPS:5: "++chrome/browser/sync/internal_api",
> ++?
> 
>
http://codereview.chromium.org/8468023/diff/1041/chrome/browser/sync/encrypti...
> File chrome/browser/sync/encryption/cryptographer.h (right):
> 
>
http://codereview.chromium.org/8468023/diff/1041/chrome/browser/sync/encrypti...
> chrome/browser/sync/encryption/cryptographer.h:18: #include
> "chrome/browser/sync/encryption/nigori.h"
> This #include and others in the patch are not in alphabetical order.
> 
>
http://codereview.chromium.org/8468023/diff/1041/chrome/browser/sync/encrypti...
> File chrome/browser/sync/encryption/nigori_util.cc (right):
> 
>
http://codereview.chromium.org/8468023/diff/1041/chrome/browser/sync/encrypti...
> chrome/browser/sync/encryption/nigori_util.cc:41:
> entry.Get(syncable::SPECIFICS),
> indent by one more space.
> 
>
http://codereview.chromium.org/8468023/diff/1041/chrome/browser/sync/encrypti...
> chrome/browser/sync/encryption/nigori_util.cc:80:
> entry.Get(syncable::NON_UNIQUE_NAME) != kEncryptedString);
> rewrite as:
>   return SpecificsNeedsEncryption(
>       encrypted_types,
>       entry.Get(syncable::SPECIFICS)) || encrypted_types.count(type) > 0 &&
>           entry.Get(NON_UNIQUE_NAME) != kEncryptedString);
> 
>
http://codereview.chromium.org/8468023/diff/1041/chrome/browser/sync/encrypti...
> chrome/browser/sync/encryption/nigori_util.cc:99: if (type ==
> syncable::PASSWORDS || type == syncable::NIGORI) {
> unindent this line
> 
>
http://codereview.chromium.org/8468023/diff/1041/chrome/browser/sync/encrypti...
> File chrome/browser/sync/encryption/nigori_util.h (right):
> 
>
http://codereview.chromium.org/8468023/diff/1041/chrome/browser/sync/encrypti...
> chrome/browser/sync/encryption/nigori_util.h:35: // Check if our unsyced
changes
> are encrypted if they need to be based on
> unsyced -> unsynced
> 
>
http://codereview.chromium.org/8468023/diff/1041/chrome/browser/sync/encrypti...
> chrome/browser/sync/encryption/nigori_util.h:69: }  // namespace browser_sync
> newline after

reminder ping on this