Forward password-store switch to OSCrypt component

chrome/app/chrome_main_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/app/chrome_main_delegate.h"
 
 #include <stddef.h>
 #include <string>
 
 #include "base/base_paths.h"
@@ skipping 105 matching lines @@
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include "components/crash/content/app/breakpad_linux.h"
 #endif
 
 #if defined(OS_LINUX)
 #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
 
 #if defined(OS_CHROMEOS)
 #include "components/metrics/leak_detector/leak_detector.h"
 #endif
 
 #if !defined(DISABLE_NACL)
 #include "components/nacl/common/nacl_switches.h"
@@ skipping 504 matching lines @@
 
 #if defined (OS_CHROMEOS)
   // The TLS slot used by metrics::LeakDetector needs to be initialized early to
   // ensure that it gets assigned a low slow number. If it gets initialized too
   // late, the glibc TLS system will require a malloc call in order to allocate
   // storage for a higher slot number. Normally that's not a problem, but in
   // LeakDetector it will result in recursive alloc hook function calls.
   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;
 }
 
 #if defined(OS_MACOSX)
 void ChromeMainDelegate::InitMacCrashReporter(
     const base::CommandLine& command_line,
     const std::string& process_type) {
   // TODO(mark): Right now, InitializeCrashpad() needs to be called after
   // CommandLine::Init() and chrome::RegisterPathProvider().  Ideally, Crashpad
   // initialization could occur sooner, preferably even before the framework
@@ skipping 378 matching lines @@
     case version_info::Channel::CANARY:
       return true;
     case version_info::Channel::DEV:
     case version_info::Channel::BETA:
     case version_info::Channel::STABLE:
     default:
       // Don't enable instrumentation.
       return false;
   }
 }