Compile content_unittests service catalog directly into the binary

content/browser/dom_storage/local_storage_context_mojo_unittest.cc

 // Copyright 2016 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/browser/dom_storage/local_storage_context_mojo.h"
 
 #include "base/files/file_enumerator.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 708 matching lines @@
     return success;
   }
 
  private:
   TestBrowserThreadBundle thread_bundle_;
   base::ScopedTempDir temp_path_;
 
   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");
   auto value = StdStringToUint8Vector("value");
 
   mojom::LevelDBWrapperPtr wrapper;
   context->OpenLocalStorage(url::Origin(GURL("http://foobar.com")),
                             MakeRequest(&wrapper));
 
   DoTestPut(context.get(), key, value);
   std::vector<uint8_t> result;
   EXPECT_TRUE(DoTestGet(context.get(), key, &result));
   EXPECT_EQ(value, result);
 
   context.reset();
   base::RunLoop().RunUntilIdle();
 
   // Should not have created any files.
   EXPECT_TRUE(FirstEntryInDir().empty());
 
   // Re-opening should get fresh data.
   context = base::MakeUnique<LocalStorageContextMojo>(
       connector(), nullptr, base::FilePath(), base::FilePath());
   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("../../")));
   auto key = StdStringToUint8Vector("key");
   auto value = StdStringToUint8Vector("value");
 
   mojom::LevelDBWrapperPtr wrapper;
   context->OpenLocalStorage(url::Origin(GURL("http://foobar.com")),
                             MakeRequest(&wrapper));
 
   DoTestPut(context.get(), key, value);
   std::vector<uint8_t> result;
   EXPECT_TRUE(DoTestGet(context.get(), key, &result));
   EXPECT_EQ(value, result);
 
   context.reset();
   base::RunLoop().RunUntilIdle();
 
   // Should not have created any files.
   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);
   auto key = StdStringToUint8Vector("key");
   auto value = StdStringToUint8Vector("value");
 
   DoTestPut(context.get(), key, value);
   std::vector<uint8_t> result;
   EXPECT_TRUE(DoTestGet(context.get(), key, &result));
   EXPECT_EQ(value, result);
 
   context.reset();
   base::RunLoop().RunUntilIdle();
 
   // Should have created files.
   EXPECT_EQ(test_path, FirstEntryInDir().BaseName());
 
   // Should be able to re-open.
   context = base::MakeUnique<LocalStorageContextMojo>(
       connector(), nullptr, base::FilePath(), test_path);
   EXPECT_TRUE(DoTestGet(context.get(), key, &result));
   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.
   auto context = base::MakeUnique<LocalStorageContextMojo>(
       connector(), nullptr, base::FilePath(), test_path);
   auto key = StdStringToUint8Vector("key");
   auto value = StdStringToUint8Vector("value");
 
   DoTestPut(context.get(), key, value);
   std::vector<uint8_t> result;
@@ skipping 28 matching lines @@
   base::RunLoop().RunUntilIdle();
 
   // Data should have been preserved now.
   context = base::MakeUnique<LocalStorageContextMojo>(
       connector(), nullptr, base::FilePath(), test_path);
   EXPECT_TRUE(DoTestGet(context.get(), key, &result));
   EXPECT_EQ(value, result);
 }
 
 }  // namespace content