Compile content_unittests service catalog directly into the binary

content/browser/dom_storage/local_storage_context_mojo_unittest.cc

Index: content/browser/dom_storage/local_storage_context_mojo_unittest.cc
diff --git a/content/browser/dom_storage/local_storage_context_mojo_unittest.cc b/content/browser/dom_storage/local_storage_context_mojo_unittest.cc
index ae68d8e2cb9b7aea8207cb10d4177d13bbbe8321..fd02d4cfebf1169e419c8faf9168148649f3d8bb 100644
--- a/content/browser/dom_storage/local_storage_context_mojo_unittest.cc
+++ b/content/browser/dom_storage/local_storage_context_mojo_unittest.cc
@@ -726,14 +726,7 @@ class LocalStorageContextMojoTestWithService
   DISALLOW_COPY_AND_ASSIGN(LocalStorageContextMojoTestWithService);
 };
 
-// Enable when http://crbug.com/677194 is fixed and ServiceTest works
-// correctly on Android.
-#if defined(OS_ANDROID)
-#define MAYBE_InMemory DISABLED_InMemory
-#else
-#define MAYBE_InMemory InMemory
-#endif
-TEST_F(LocalStorageContextMojoTestWithService, MAYBE_InMemory) {
+TEST_F(LocalStorageContextMojoTestWithService, InMemory) {
   auto context = base::MakeUnique<LocalStorageContextMojo>(
       connector(), nullptr, base::FilePath(), base::FilePath());
   auto key = StdStringToUint8Vector("key");
@@ -760,14 +753,7 @@ TEST_F(LocalStorageContextMojoTestWithService, MAYBE_InMemory) {
   EXPECT_FALSE(DoTestGet(context.get(), key, &result));
 }
 
-// Enable when http://crbug.com/677194 is fixed and ServiceTest works
-// correctly on Android.
-#if defined(OS_ANDROID)
-#define MAYBE_InMemoryInvalidPath DISABLED_InMemoryInvalidPath
-#else
-#define MAYBE_InMemoryInvalidPath InMemoryInvalidPath
-#endif
-TEST_F(LocalStorageContextMojoTestWithService, MAYBE_InMemoryInvalidPath) {
+TEST_F(LocalStorageContextMojoTestWithService, InMemoryInvalidPath) {
   auto context = base::MakeUnique<LocalStorageContextMojo>(
       connector(), nullptr, base::FilePath(),
       base::FilePath(FILE_PATH_LITERAL("../../")));
@@ -790,14 +776,7 @@ TEST_F(LocalStorageContextMojoTestWithService, MAYBE_InMemoryInvalidPath) {
   EXPECT_TRUE(FirstEntryInDir().empty());
 }
 
-// Enable when http://crbug.com/677194 is fixed and ServiceTest works
-// correctly on Android.
-#if defined(OS_ANDROID)
-#define MAYBE_OnDisk DISABLED_OnDisk
-#else
-#define MAYBE_OnDisk OnDisk
-#endif
-TEST_F(LocalStorageContextMojoTestWithService, MAYBE_OnDisk) {
+TEST_F(LocalStorageContextMojoTestWithService, OnDisk) {
   base::FilePath test_path(FILE_PATH_LITERAL("test_path"));
   auto context = base::MakeUnique<LocalStorageContextMojo>(
       connector(), nullptr, base::FilePath(), test_path);
@@ -822,14 +801,7 @@ TEST_F(LocalStorageContextMojoTestWithService, MAYBE_OnDisk) {
   EXPECT_EQ(value, result);
 }
 
-// Enable when http://crbug.com/677194 is fixed and ServiceTest works
-// correctly on Android.
-#if defined(OS_ANDROID)
-#define MAYBE_InvalidVersionOnDisk DISABLED_InvalidVersionOnDisk
-#else
-#define MAYBE_InvalidVersionOnDisk InvalidVersionOnDisk
-#endif
-TEST_F(LocalStorageContextMojoTestWithService, MAYBE_InvalidVersionOnDisk) {
+TEST_F(LocalStorageContextMojoTestWithService, InvalidVersionOnDisk) {
   base::FilePath test_path(FILE_PATH_LITERAL("test_path"));
 
   // Create context and add some data to it.