Remove hacks added to workaround a system salt issue for M31

Remove hacks added to workaround a system salt issue for M31

In crrev.com/228189, we had to add horrible hacks to workaround an urgent
P1 issue, which needed to be merged to M31 branch immediately.

The hacks are no longer necesssary, as the system salt is obtained
before DeviceOAuth2TokenService is created. See crbug.com/309959
for details.

BUG=306547
TEST=see the bug comment #9
R=hashimoto@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=230969

[satorux1, 2013-10-25 05:01:24]

this change depends on https://codereview.chromium.org/39443002/

[hashimoto, 2013-10-25 05:08:00]

https://codereview.chromium.org/43203002/diff/1/chrome/browser/chromeos/app_m...
File chrome/browser/chromeos/app_mode/startup_app_launcher.cc (right):

https://codereview.chromium.org/43203002/diff/1/chrome/browser/chromeos/app_m...
chrome/browser/chromeos/app_mode/startup_app_launcher.cc:283: void
StartupAppLauncher::OnReadyToLaunch(const std::string& system_salt) {
This argument should be removed.

[satorux1, 2013-10-25 05:11:21]

https://codereview.chromium.org/43203002/diff/1/chrome/browser/chromeos/app_m...
File chrome/browser/chromeos/app_mode/startup_app_launcher.cc (right):

https://codereview.chromium.org/43203002/diff/1/chrome/browser/chromeos/app_m...
chrome/browser/chromeos/app_mode/startup_app_launcher.cc:283: void
StartupAppLauncher::OnReadyToLaunch(const std::string& system_salt) {
On 2013/10/25 05:08:01, hashimoto wrote:
> This argument should be removed.

oops. too early to upload. fixed.

[hashimoto, 2013-10-25 05:17:03]

lgtm

https://codereview.chromium.org/43203002/diff/50001/chrome/browser/chromeos/a...
File chrome/browser/chromeos/app_mode/startup_app_launcher.h (right):

https://codereview.chromium.org/43203002/diff/50001/chrome/browser/chromeos/a...
chrome/browser/chromeos/app_mode/startup_app_launcher.h:81: void
EnsureSystemSaltIsLoaded();
nit: Remove this line.

https://codereview.chromium.org/43203002/diff/50001/chrome/browser/chromeos/s...
File chrome/browser/chromeos/settings/device_oauth2_token_service.cc (right):

https://codereview.chromium.org/43203002/diff/50001/chrome/browser/chromeos/s...
chrome/browser/chromeos/settings/device_oauth2_token_service.cc:19: #include
"chromeos/cryptohome/system_salt_getter.h"
nit: No need to include this?

[satorux1, 2013-10-25 05:23:57]

https://codereview.chromium.org/43203002/diff/50001/chrome/browser/chromeos/a...
File chrome/browser/chromeos/app_mode/startup_app_launcher.h (right):

https://codereview.chromium.org/43203002/diff/50001/chrome/browser/chromeos/a...
chrome/browser/chromeos/app_mode/startup_app_launcher.h:81: void
EnsureSystemSaltIsLoaded();
On 2013/10/25 05:17:03, hashimoto wrote:
> nit: Remove this line.

Done.

https://codereview.chromium.org/43203002/diff/50001/chrome/browser/chromeos/s...
File chrome/browser/chromeos/settings/device_oauth2_token_service.cc (right):

https://codereview.chromium.org/43203002/diff/50001/chrome/browser/chromeos/s...
chrome/browser/chromeos/settings/device_oauth2_token_service.cc:19: #include
"chromeos/cryptohome/system_salt_getter.h"
On 2013/10/25 05:17:03, hashimoto wrote:
> nit: No need to include this?

Done.

[hashimoto, 2013-10-25 05:25:38]

https://codereview.chromium.org/43203002/diff/50001/chrome/browser/chromeos/s...
File chrome/browser/chromeos/settings/device_oauth2_token_service.cc (right):

https://codereview.chromium.org/43203002/diff/50001/chrome/browser/chromeos/s...
chrome/browser/chromeos/settings/device_oauth2_token_service.cc:19: #include
"chromeos/cryptohome/system_salt_getter.h"
On 2013/10/25 05:23:57, satorux1 wrote:
> On 2013/10/25 05:17:03, hashimoto wrote:
> > nit: No need to include this?
> 
> Done.

I see no changes here.
Is this include needed in this file?

[satorux1, 2013-10-25 05:28:59]

On 2013/10/25 05:25:38, hashimoto wrote:
>
https://codereview.chromium.org/43203002/diff/50001/chrome/browser/chromeos/s...
> File chrome/browser/chromeos/settings/device_oauth2_token_service.cc (right):
> 
>
https://codereview.chromium.org/43203002/diff/50001/chrome/browser/chromeos/s...
> chrome/browser/chromeos/settings/device_oauth2_token_service.cc:19: #include
> "chromeos/cryptohome/system_salt_getter.h"
> On 2013/10/25 05:23:57, satorux1 wrote:
> > On 2013/10/25 05:17:03, hashimoto wrote:
> > > nit: No need to include this?
> > 
> > Done.
> 
> I see no changes here.
> Is this include needed in this file?

You opened too early. Please check Patch Set 3

[satorux1, 2013-10-25 05:30:36]

no. you were right... please see patch set 4 coming..

https://codereview.chromium.org/43203002/diff/50001/chrome/browser/chromeos/s...
File chrome/browser/chromeos/settings/device_oauth2_token_service.cc (right):

https://codereview.chromium.org/43203002/diff/50001/chrome/browser/chromeos/s...
chrome/browser/chromeos/settings/device_oauth2_token_service.cc:19: #include
"chromeos/cryptohome/system_salt_getter.h"
On 2013/10/25 05:25:39, hashimoto wrote:
> On 2013/10/25 05:23:57, satorux1 wrote:
> > On 2013/10/25 05:17:03, hashimoto wrote:
> > > nit: No need to include this?
> > 
> > Done.
> 
> I see no changes here.
> Is this include needed in this file?

oops. I forgot about this one. removed.

[hashimoto, 2013-10-25 05:31:56]

lgtm, thanks

https://codereview.chromium.org/43203002/diff/50001/chrome/browser/chromeos/s...
File chrome/browser/chromeos/settings/device_oauth2_token_service.cc (right):

https://codereview.chromium.org/43203002/diff/50001/chrome/browser/chromeos/s...
chrome/browser/chromeos/settings/device_oauth2_token_service.cc:19: #include
"chromeos/cryptohome/system_salt_getter.h"
On 2013/10/25 05:30:37, satorux1 wrote:
> On 2013/10/25 05:25:39, hashimoto wrote:
> > On 2013/10/25 05:23:57, satorux1 wrote:
> > > On 2013/10/25 05:17:03, hashimoto wrote:
> > > > nit: No need to include this?
> > > 
> > > Done.
> > 
> > I see no changes here.
> > Is this include needed in this file?
> 
> oops. I forgot about this one. removed.

Ah, you removed the one in startup_app_launcher.cc.
It's a good catch indeed.

[satorux1, 2013-10-25 06:43:23]

Committed patchset #4 manually as r230969 (presubmit successful).