summaryrefslogtreecommitdiffstats
path: root/chrome/test/perf
diff options
context:
space:
mode:
authorasargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-18 23:25:55 +0000
committerasargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-18 23:25:55 +0000
commitb2729b58d392ba2272a7f98c6ee6d7b917c4841c (patch)
tree9e2dd6c778c1bd4fd36eb60ae38bd75cd1869957 /chrome/test/perf
parent53b4cc1380a09bba155f2465dc263c78033e8229 (diff)
downloadchromium_src-b2729b58d392ba2272a7f98c6ee6d7b917c4841c.zip
chromium_src-b2729b58d392ba2272a7f98c6ee6d7b917c4841c.tar.gz
chromium_src-b2729b58d392ba2272a7f98c6ee6d7b917c4841c.tar.bz2
Revert 212459 "Remove TextDatabase from the history service."
This appears to have broken several history unit tests on Mac 10.6 AddNewRows CacheSaveRestore CursorPositionRetrieval DeleteRows ExpireRow HugeResultSet NonUniqueTermCharacterSets ProperStringMatching ReadVisitsFromHistory RebuildFromHistoryIfCacheOld Retrieval TitleChange TitleSearch TypedCharacterCaching URLPrefixMatching WhitelistedURLs Example output: http://build.chromium.org/p/chromium.mac/builders/Mac10.6%20Tests%20%282%29/builds/40521/steps/unit_tests/logs/AddNewRows > Remove TextDatabase from the history service. > > The full text indexing feature is no longer used by anything. > - Remove the TextDatabase, TextDatabaseManager and related files. > - Remove is_indexed field from VisitRow objects. > - Modify ExpireHistoryBackend and HistoryBackend to no longer call TextDatabase > - Have HistoryBackend delete the "History Index *" files from the users profile > - Remove ChromeViewHostMsg_PageContents IPC message since the browser process > no longer requires to have the page contents of recently loaded pages. > > BUG=247418 > TESTS=unit tests, manual testing and run through trybots. > > Review URL: https://chromiumcodereview.appspot.com/16951015 TBR=rmcilroy@chromium.org Review URL: https://codereview.chromium.org/19637009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212473 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/perf')
-rw-r--r--chrome/test/perf/generate_profile.cc2
-rw-r--r--chrome/test/perf/generate_profile.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/chrome/test/perf/generate_profile.cc b/chrome/test/perf/generate_profile.cc
index f66056c..d37060a 100644
--- a/chrome/test/perf/generate_profile.cc
+++ b/chrome/test/perf/generate_profile.cc
@@ -192,6 +192,8 @@ void InsertURLBatch(Profile* profile,
transition, history::SOURCE_BROWSED, true);
ThumbnailScore score(0.75, false, false);
history_service->SetPageTitle(url, ConstructRandomTitle());
+ if (types & FULL_TEXT)
+ history_service->SetPageContents(url, ConstructRandomPage());
if (types & TOP_SITES && top_sites) {
top_sites->SetPageThumbnailToJPEGBytes(
url,
diff --git a/chrome/test/perf/generate_profile.h b/chrome/test/perf/generate_profile.h
index fe1cfbf..85a2858 100644
--- a/chrome/test/perf/generate_profile.h
+++ b/chrome/test/perf/generate_profile.h
@@ -14,7 +14,8 @@ class FilePath;
// Addition types data can be generated for. By default only urls/visits are
// added.
enum GenerateProfileTypes {
- TOP_SITES = 1 << 0
+ TOP_SITES = 1 << 0,
+ FULL_TEXT = 1 << 1
};
// Generates a user profile and history by psuedo-randomly generating data and