Move the android data dir retrieving code out of DCHECK.

content/shell/shell_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 "content/shell/shell_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 77 matching lines @@
 }
 
 void ShellMainDelegate::InitializeResourceBundle() {
   FilePath pak_file;
 #if defined(OS_MACOSX)
   pak_file = GetResourcesPakFilePath();
 #else
   FilePath pak_dir;
 
 #if defined(OS_ANDROID)
-  DCHECK(PathService::Get(base::DIR_ANDROID_APP_DATA, &pak_dir));
+  bool got_path = PathService::Get(base::DIR_ANDROID_APP_DATA, &pak_dir);
+  DCHECK(got_path);
   pak_dir = pak_dir.Append(FILE_PATH_LITERAL("paks"));
 #else
   PathService::Get(base::DIR_MODULE, &pak_dir);
 #endif
 
   pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak"));
 #endif
   ui::ResourceBundle::InitSharedInstanceWithPakFile(pak_file);
 }
 
 content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {
   browser_client_.reset(new content::ShellContentBrowserClient);
   return browser_client_.get();
 }
 
 content::ContentRendererClient*
     ShellMainDelegate::CreateContentRendererClient() {
   renderer_client_.reset(new content::ShellContentRendererClient);
   return renderer_client_.get();
 }