Use extension-based file picker from CrOS for Aura builds.

chrome/browser/profiles/profile_impl.cc

 // Copyright (c) 2011 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/browser/profiles/profile_impl.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/file_path.h"
@@ skipping 138 matching lines @@
 #if defined(OS_MACOSX)
 // Capacity for mock keychain used for testing.
 static const int kMockKeychainSize = 1000;
 #endif
 
 enum ContextType {
   kNormalContext,
   kMediaContext
 };
 
+typedef std::list<std::pair<FilePath::StringType, int> >
+    ComponentExtensionList;
+
+#if defined(FILE_MANAGER_EXTENSION)
+void AddFileManagerExtension(ComponentExtensionList* component_extensions) {
+#ifndef NDEBUG
+  const CommandLine* command_line = CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kFileManagerExtensionPath)) {
+    FilePath filemgr_extension_path =
+        command_line->GetSwitchValuePath(switches::kFileManagerExtensionPath);
+    component_extensions->push_back(std::make_pair(
+        filemgr_extension_path.value(),
+        IDR_FILEMANAGER_MANIFEST));
+    return;
+  }
+#endif  // NDEBUG
+  component_extensions->push_back(std::make_pair(
+      FILE_PATH_LITERAL("file_manager"),
+      IDR_FILEMANAGER_MANIFEST));
+}
+#endif  // defined(FILE_MANAGER_EXTENSION)
+
 // Gets the cache parameters from the command line. |type| is the type of
 // request context that we need, |cache_path| will be set to the user provided
 // path, or will not be touched if there is not an argument. |max_size| will
 // be the user provided value or zero by default.
 void GetCacheParameters(ContextType type, FilePath* cache_path,
                         int* max_size) {
   DCHECK(cache_path);
   DCHECK(max_size);
 
   // Override the cache location if specified by the user.
@@ skipping 435 matching lines @@
   typedef std::list<std::pair<FilePath::StringType, int> >
       ComponentExtensionList;
   ComponentExtensionList component_extensions;
 
   // Bookmark manager.
   component_extensions.push_back(std::make_pair(
       FILE_PATH_LITERAL("bookmark_manager"),
       IDR_BOOKMARKS_MANIFEST));
 
 #if defined(FILE_MANAGER_EXTENSION)
-  const CommandLine* command_line = CommandLine::ForCurrentProcess();
-#ifndef NDEBUG
-  if (command_line->HasSwitch(switches::kFileManagerExtensionPath)) {
-    FilePath filemgr_extension_path =
-        command_line->GetSwitchValuePath(switches::kFileManagerExtensionPath);
-    component_extensions.push_back(std::make_pair(
-        filemgr_extension_path.value(),
-        IDR_FILEMANAGER_MANIFEST));
-  } else {
-    component_extensions.push_back(std::make_pair(
-        FILE_PATH_LITERAL("file_manager"),
-        IDR_FILEMANAGER_MANIFEST));
-  }
-#else
-  component_extensions.push_back(std::make_pair(
-      FILE_PATH_LITERAL("file_manager"),
-      IDR_FILEMANAGER_MANIFEST));
-#endif
+  AddFileManagerExtension(&component_extensions);
 #endif
 
 #if defined(TOUCH_UI)
   component_extensions.push_back(std::make_pair(
       FILE_PATH_LITERAL("keyboard"),
       IDR_KEYBOARD_MANIFEST));
 #endif
 
 #if defined(OS_CHROMEOS)
     component_extensions.push_back(std::make_pair(
         FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile"),
         IDR_MOBILE_MANIFEST));
 
+    const CommandLine* command_line = CommandLine::ForCurrentProcess();
     if (command_line->HasSwitch(switches::kAuthExtensionPath)) {
       FilePath auth_extension_path =
           command_line->GetSwitchValuePath(switches::kAuthExtensionPath);
       component_extensions.push_back(std::make_pair(
           auth_extension_path.value(),
           IDR_GAIA_TEST_AUTH_MANIFEST));
     } else {
       component_extensions.push_back(std::make_pair(
           FILE_PATH_LITERAL("/usr/share/chromeos-assets/gaia_auth"),
           IDR_GAIA_AUTH_MANIFEST));
@@ skipping 1176 matching lines @@
 SpellCheckProfile* ProfileImpl::GetSpellCheckProfile() {
   if (!spellcheck_profile_.get())
     spellcheck_profile_.reset(new SpellCheckProfile());
   return spellcheck_profile_.get();
 }
 
 void ProfileImpl::SetDownloadManagerDelegate(
     ChromeDownloadManagerDelegate* delegate) {
   download_manager_delegate_ = delegate;
 }