GCM Store: Fix invalid argument errors

google_apis/gcm/engine/gcm_store_impl_unittest.cc

Index: google_apis/gcm/engine/gcm_store_impl_unittest.cc
diff --git a/google_apis/gcm/engine/gcm_store_impl_unittest.cc b/google_apis/gcm/engine/gcm_store_impl_unittest.cc
index d2ac9f5c0b935289bc8f1fd0366d3fdc4b723bcc..1b279d503ba0f8aa5f0d0883e957d4c5bc5f0337 100644
--- a/google_apis/gcm/engine/gcm_store_impl_unittest.cc
+++ b/google_apis/gcm/engine/gcm_store_impl_unittest.cc
@@ -14,6 +14,7 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
@@ -69,6 +70,7 @@ class GCMStoreImplTest : public testing::Test {
   scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
   base::ThreadTaskRunnerHandle task_runner_handle_;
   base::ScopedTempDir temp_directory_;
+  base::FilePath store_path_;
   bool expected_success_;
   uint64_t next_persistent_id_;
 };
@@ -84,12 +86,14 @@ GCMStoreImplTest::GCMStoreImplTest()
 GCMStoreImplTest::~GCMStoreImplTest() {}
 
 std::unique_ptr<GCMStoreImpl> GCMStoreImplTest::BuildGCMStore() {
+  // Pass an non-existent directory as store path to match the exact behavior in
+  // the production code. Currently GCMStoreImpl checks if the directory exists

[Nicolas Zea, 2016/09/29 16:49:57]

should this comment be updated?

[johnme, 2016/09/29 17:08:29]

Done.

+  // or not to determine the store existence.
+  store_path_ =
+      temp_directory_.GetPath().Append(FILE_PATH_LITERAL("GCM Store"));
   return std::unique_ptr<GCMStoreImpl>(new GCMStoreImpl(
-      // Pass an non-existent directory as store path to match the exact
-      // behavior in the production code. Currently GCMStoreImpl checks if
-      // the directory exist or not to determine the store existence.
-      temp_directory_.GetPath().Append(FILE_PATH_LITERAL("GCM Store")),
-      task_runner_, base::WrapUnique<Encryptor>(new FakeEncryptor)));
+      store_path_, task_runner_,
+      base::WrapUnique<Encryptor>(new FakeEncryptor)));
 }
 
 void GCMStoreImplTest::LoadGCMStore(
@@ -140,7 +144,7 @@ TEST_F(GCMStoreImplTest, LoadNew) {
   EXPECT_EQ(base::Time::FromInternalValue(0LL), load_result->last_checkin_time);
 }
 
-// Verify new database is not created when DO_NOT_CREATE_NEW_STORE is passed.
+// Verify new database is not created when DO_NOT_CREATE is passed.
 TEST_F(GCMStoreImplTest, LoadWithoutCreatingNewStore) {
   std::unique_ptr<GCMStoreImpl> gcm_store(BuildGCMStore());
   std::unique_ptr<GCMStore::LoadResult> load_result;
@@ -155,6 +159,27 @@ TEST_F(GCMStoreImplTest, LoadWithoutCreatingNewStore) {
   EXPECT_TRUE(load_result->store_does_not_exist);
 }
 
+// Verifies that loads with DO_NOT_CREATE set store_does_not_exist to true when
+// an empty directory was left behind after destroying the database.
+TEST_F(GCMStoreImplTest, LoadWithEmptyDirectory) {
+  std::unique_ptr<GCMStoreImpl> gcm_store(BuildGCMStore());
+
+  // Create an empty directory at the store path, to simulate an empty directory
+  // being left behind after deleting a previous store.
+  ASSERT_TRUE(base::CreateDirectory(store_path_));
+
+  std::unique_ptr<GCMStore::LoadResult> load_result;
+  gcm_store->Load(
+      GCMStore::DO_NOT_CREATE,
+      base::Bind(&GCMStoreImplTest::LoadWithoutCheckCallback,
+                 base::Unretained(this),
+                 &load_result));
+  PumpLoop();
+
+  EXPECT_FALSE(load_result->success);
+  EXPECT_TRUE(load_result->store_does_not_exist);
+}
+
 TEST_F(GCMStoreImplTest, DeviceCredentials) {
   std::unique_ptr<GCMStoreImpl> gcm_store(BuildGCMStore());
   std::unique_ptr<GCMStore::LoadResult> load_result;