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..54991898de008c501290581d6ddb687b1487067c 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 chose between different password stores.

[Lei Zhang, 2016/07/06 18:57:28]

nit: choose

[cfroussios, 2016/07/11 08:32:00]

Done.

+#include "components/os_crypt/os_crypt.h"
+#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);
+#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+
   return false;
 }