Fix Jumbo builds with UNINITIALIZED values

Error:

../../content/browser/service_worker/service_worker_database.h:398:5: error: declaration shadows a variable in namespace 'content::(anonymous)' [-Werror,-Wshadow]
    UNINITIALIZED,
    ^
../../content/browser/service_worker/service_worker_storage.h:566:5: error: declaration shadows a variable in namespace 'content::(anonymous)' [-Werror,-Wshadow]
    UNINITIALIZED,
    ^

./../../content/browser/browser_thread_impl.cc:36:3: note: previous declaration is here
  UNINITIALIZED = 0,
  ^

Example compilation settings:

target_os="android"
target_cpu="arm"
enable_nacl=false
symbol_level=0
remove_webcore_debug_symbols=true
is_debug=false
dcheck_always_on=false
is_component_build=false
use_jumbo_build=true

BUG=903460

Change-Id: Ie8c6ef88ac299e02724bcbbeb1db69e67515f62b
Reviewed-on: https://chromium-review.googlesource.com/c/1327213Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Marcin Wiącek <marcin@mwiacek.com>
Cr-Commit-Position: refs/heads/master@{#606763}

content/browser/service_worker/service_worker_database.cc

@@ -293,7 +293,7 @@ ServiceWorkerDatabase::ServiceWorkerDatabase(const base::FilePath& path)
       next_avail_registration_id_(0),
       next_avail_resource_id_(0),
       next_avail_version_id_(0),
-      state_(UNINITIALIZED) {
+      state_(DATABASE_STATE_UNINITIALIZED) {
   sequence_checker_.DetachFromSequence();
 }
 
@@ -1237,7 +1237,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::LazyOpen(
   DCHECK(sequence_checker_.CalledOnValidSequence());
 
   // Do not try to open a database if we tried and failed once.
-  if (state_ == DISABLED)
+  if (state_ == DATABASE_STATE_DISABLED)
     return STATUS_ERROR_FAILED;
   if (IsOpen())
     return STATUS_OK;
@@ -1277,7 +1277,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::LazyOpen(
   switch (db_version) {
     case 0:
       // This database is new. It will be initialized when something is written.
-      DCHECK_EQ(UNINITIALIZED, state_);
+      DCHECK_EQ(DATABASE_STATE_UNINITIALIZED, state_);
       return STATUS_OK;
     case 1:
       // This database has an obsolete schema version. ServiceWorkerStorage
@@ -1287,7 +1287,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::LazyOpen(
       return status;
     case 2:
       DCHECK_EQ(db_version, service_worker_internals::kCurrentSchemaVersion);
-      state_ = INITIALIZED;
+      state_ = DATABASE_STATE_INITIALIZED;
       return STATUS_OK;
     default:
       // Other cases should be handled in ReadDatabaseVersion.
@@ -1300,7 +1300,7 @@ bool ServiceWorkerDatabase::IsNewOrNonexistentDatabase(
     ServiceWorkerDatabase::Status status) {
   if (status == STATUS_ERROR_NOT_FOUND)
     return true;
-  if (status == STATUS_OK && state_ == UNINITIALIZED)
+  if (status == STATUS_OK && state_ == DATABASE_STATE_UNINITIALIZED)
     return true;
   return false;
 }
@@ -1773,14 +1773,14 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadDatabaseVersion(
 ServiceWorkerDatabase::Status ServiceWorkerDatabase::WriteBatch(
     leveldb::WriteBatch* batch) {
   DCHECK(batch);
-  DCHECK_NE(DISABLED, state_);
+  DCHECK_NE(DATABASE_STATE_DISABLED, state_);
 
-  if (state_ == UNINITIALIZED) {
+  if (state_ == DATABASE_STATE_UNINITIALIZED) {
     // Write database default values.
     batch->Put(
         service_worker_internals::kDatabaseVersionKey,
         base::Int64ToString(service_worker_internals::kCurrentSchemaVersion));
-    state_ = INITIALIZED;
+    state_ = DATABASE_STATE_INITIALIZED;
   }
 
   Status status = LevelDBStatusToServiceWorkerDBStatus(
@@ -1833,7 +1833,7 @@ void ServiceWorkerDatabase::Disable(const base::Location& from_here,
                 << " with error: " << StatusToString(status);
     DLOG(ERROR) << "ServiceWorkerDatabase is disabled.";
   }
-  state_ = DISABLED;
+  state_ = DATABASE_STATE_DISABLED;
   db_.reset();
 }
 

content/browser/service_worker/service_worker_database.h

@@ -395,9 +395,9 @@ class CONTENT_EXPORT ServiceWorkerDatabase {
   int64_t next_avail_version_id_;
 
   enum State {
-    UNINITIALIZED,
-    INITIALIZED,
-    DISABLED,
+    DATABASE_STATE_UNINITIALIZED,
+    DATABASE_STATE_INITIALIZED,
+    DATABASE_STATE_DISABLED,
   };
   State state_;
 

content/browser/service_worker/service_worker_database_unittest.cc

@@ -972,7 +972,8 @@ TEST(ServiceWorkerDatabaseTest, Registration_UninitializedDatabase) {
   database->LazyOpen(true);
 
   // Should be failed because the database is not initialized.
-  ASSERT_EQ(ServiceWorkerDatabase::UNINITIALIZED, database->state_);
+  ASSERT_EQ(ServiceWorkerDatabase::DATABASE_STATE_UNINITIALIZED,
+            database->state_);
   EXPECT_EQ(ServiceWorkerDatabase::STATUS_ERROR_NOT_FOUND,
             database->ReadRegistration(
                 100, origin, &data_out, &resources_out));
@@ -1659,7 +1660,8 @@ TEST(ServiceWorkerDatabaseTest, UserData_UninitializedDatabase) {
   database->LazyOpen(true);
 
   // Should be failed because the database is not initialized.
-  ASSERT_EQ(ServiceWorkerDatabase::UNINITIALIZED, database->state_);
+  ASSERT_EQ(ServiceWorkerDatabase::DATABASE_STATE_UNINITIALIZED,
+            database->state_);
   EXPECT_EQ(ServiceWorkerDatabase::STATUS_ERROR_NOT_FOUND,
             database->ReadUserData(100, {"key"}, &user_data_out));
   EXPECT_EQ(ServiceWorkerDatabase::STATUS_ERROR_NOT_FOUND,

content/browser/service_worker/service_worker_storage.h

@@ -563,10 +563,10 @@ class CONTENT_EXPORT ServiceWorkerStorage
   int64_t next_resource_id_;
 
   enum State {
-    UNINITIALIZED,
-    INITIALIZING,
-    INITIALIZED,
-    DISABLED,
+    STORAGE_STATE_UNINITIALIZED,
+    STORAGE_STATE_INITIALIZING,
+    STORAGE_STATE_INITIALIZED,
+    STORAGE_STATE_DISABLED,
   };
   State state_;