Forward password-store switch to OSCrypt component

chrome/app/chrome_main_delegate.cc

Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index eb91daa5dfe352ea2ed2f2826cc22f957e202742..cedc21e32a220224b6347fcd1a945d311d579c62 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -123,6 +123,11 @@
 #include "base/environment.h"
 #endif
 
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+// Linux allows to choose between different password stores.
+#include "components/os_crypt/os_crypt.h"  // nogncheck

[Lei Zhang, 2016/07/12 02:02:53]

Is the "nogncheck" needed? What are we ignoring?

[cfroussios, 2016/07/12 15:25:35]

This was news to me (crbug/625122), but gn completely ignores preprocessor
conditions. Since os_crypt is added as a dependency only on linux, 'gn check'
fails on every other platform, since it sees this #include as illegal.

This is not needed anymore.

+#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+
 #if defined(OS_MACOSX) || defined(OS_WIN)
 #include "chrome/browser/policy/policy_path_parser.h"
 #endif
@@ -647,6 +652,13 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exit_code) {
   metrics::LeakDetector::InitTLSSlot();
 #endif
 
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+  // Forward to os_crypt the flag to use a specific password store.
+  std::string password_store =
+      command_line.GetSwitchValueASCII(switches::kPasswordStore);
+  OSCrypt::SetStore(password_store);

[Lei Zhang, 2016/07/12 02:02:53]

This is very early in the start up process indeed, though it runs for all
process types, e.g. the GPU process. That seems unnecessary. Can we do this in
chrome_browser_main.cc? Even PostProfileInit() may be early enough, but I'm not
100% sure.

[cfroussios, 2016/07/12 15:25:35]

From what I can tell, PostProfileInit() is early enough for the way that things
are now. I added a DCHECK to verify that this won't change. I don't think it is
possible to make a proper test about this.

+#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+
   return false;
 }