Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Side by Side Diff: chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellApplication.java

Issue 156333002: Enable icu_use_data_file_flag on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Log.w -> Log.e in ResourceExtractor-deleteFiles Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.testshell; 5 package org.chromium.chrome.testshell;
6 6
7 import android.content.Intent; 7 import android.content.Intent;
8 8
9 import org.chromium.base.CommandLine; 9 import org.chromium.base.CommandLine;
10 import org.chromium.base.PathUtils; 10 import org.chromium.base.PathUtils;
11 import org.chromium.chrome.browser.ChromiumApplication; 11 import org.chromium.chrome.browser.ChromiumApplication;
12 import org.chromium.chrome.browser.PKCS11AuthenticationManager; 12 import org.chromium.chrome.browser.PKCS11AuthenticationManager;
13 import org.chromium.chrome.browser.UmaUtils; 13 import org.chromium.chrome.browser.UmaUtils;
14 import org.chromium.chrome.browser.invalidation.UniqueIdInvalidationClientNameGe nerator; 14 import org.chromium.chrome.browser.invalidation.UniqueIdInvalidationClientNameGe nerator;
15 import org.chromium.content.browser.ResourceExtractor; 15 import org.chromium.content.browser.ResourceExtractor;
16 16
17 import java.util.ArrayList; 17 import java.util.ArrayList;
18 18
19 /** 19 /**
20 * A basic test shell {@link android.app.Application}. Handles setting up the n ative library and 20 * A basic test shell {@link android.app.Application}. Handles setting up the n ative library and
21 * loading the right resources. 21 * loading the right resources.
22 */ 22 */
23 public class ChromiumTestShellApplication extends ChromiumApplication { 23 public class ChromiumTestShellApplication extends ChromiumApplication {
24 private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "chromiumtestshe ll"; 24 private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "chromiumtestshe ll";
25 private static final String[] CHROME_MANDATORY_PAKS = { 25 private static final String[] CHROME_MANDATORY_PAKS = {
26 "en-US.pak", 26 "en-US.pak",
27 "resources.pak", 27 "resources.pak",
28 "chrome_100_percent.pak", 28 "chrome_100_percent.pak",
29 "icudtl.dat",
Andrew Hayden (chromium.org) 2014/02/25 13:52:56 It would be a good idea to add a comment here stat
29 }; 30 };
30 private static final String COMMAND_LINE_FILE = 31 private static final String COMMAND_LINE_FILE =
31 "/data/local/tmp/chromium-testshell-command-line"; 32 "/data/local/tmp/chromium-testshell-command-line";
32 33
33 ArrayList<ChromiumTestShellApplicationObserver> mObservers; 34 ArrayList<ChromiumTestShellApplicationObserver> mObservers;
34 35
35 @Override 36 @Override
36 public void onCreate() { 37 public void onCreate() {
37 // We want to do this at the earliest possible point in startup. 38 // We want to do this at the earliest possible point in startup.
38 UmaUtils.recordMainEntryPointTime(); 39 UmaUtils.recordMainEntryPointTime();
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 @Override 88 @Override
88 protected boolean areParentalControlsEnabled() { 89 protected boolean areParentalControlsEnabled() {
89 return false; 90 return false;
90 } 91 }
91 92
92 @Override 93 @Override
93 protected PKCS11AuthenticationManager getPKCS11AuthenticationManager() { 94 protected PKCS11AuthenticationManager getPKCS11AuthenticationManager() {
94 return new TestShellPKCS11AuthenticationManager(); 95 return new TestShellPKCS11AuthenticationManager();
95 } 96 }
96 } 97 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698