chrome/browser/chromeos/file_system_provider/provided_file_system_unittest.cc - Issue 674413002: [fsp] Rename ObserveEntry with AddWatcher.

Unified Diff: chrome/browser/chromeos/file_system_provider/provided_file_system_unittest.cc

Issue 674413002: [fsp] Rename ObserveEntry with AddWatcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased. Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/file_system_provider/provided_file_system_observer.h ('k') | chrome/browser/chromeos/file_system_provider/registry.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/file_system_provider/provided_file_system_unittest.cc

diff --git a/chrome/browser/chromeos/file_system_provider/provided_file_system_unittest.cc b/chrome/browser/chromeos/file_system_provider/provided_file_system_unittest.cc

index e23ebe76e41fc00a9d981c36703358ea2784e290..1974510d9dbc51ca0d11f9afbb169885e87c85b9 100644

--- a/chrome/browser/chromeos/file_system_provider/provided_file_system_unittest.cc

+++ b/chrome/browser/chromeos/file_system_provider/provided_file_system_unittest.cc

@@ -16,11 +16,11 @@

#include "base/values.h"

#include "chrome/browser/chromeos/file_system_provider/mount_path_util.h"

#include "chrome/browser/chromeos/file_system_provider/notification_manager.h"

-#include "chrome/browser/chromeos/file_system_provider/observed_entry.h"

#include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"

#include "chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h"

#include "chrome/browser/chromeos/file_system_provider/provided_file_system_observer.h"

#include "chrome/browser/chromeos/file_system_provider/request_manager.h"

+#include "chrome/browser/chromeos/file_system_provider/watcher.h"

#include "chrome/common/extensions/api/file_system_provider.h"

#include "chrome/common/extensions/api/file_system_provider_internal.h"

#include "chrome/test/base/testing_profile.h"

@@ -65,11 +65,10 @@ class FakeEventRouter : public extensions::EventRouter {

EXPECT_EQ(kFileSystemId, file_system_id);

int request_id = -1;

EXPECT_TRUE(dictionary_value->GetInteger("requestId", &request_id));

- EXPECT_TRUE(event->event_name ==

- extensions::api::file_system_provider::

- OnObserveDirectoryRequested::kEventName ||

+ EXPECT_TRUE(event->event_name == extensions::api::file_system_provider::

+ OnAddWatcherRequested::kEventName ||

event->event_name == extensions::api::file_system_provider::

- OnUnobserveEntryRequested::kEventName);

+ OnRemoveWatcherRequested::kEventName);

if (reply_result_ == base::File::FILE_OK) {

base::ListValue value_as_list;

@@ -126,9 +125,9 @@ class Observer : public ProvidedFileSystemObserver {

Observer() : list_changed_counter_(0), tag_updated_counter_(0) {}

// ProvidedFileSystemInterfaceObserver overrides.

- virtual void OnObservedEntryChanged(

+ virtual void OnWatcherChanged(

const ProvidedFileSystemInfo& file_system_info,

- const ObservedEntry& observed_entry,

+ const Watcher& watcher,

ProvidedFileSystemObserver::ChangeType change_type,

const ProvidedFileSystemObserver::Changes& changes,

const base::Closure& callback) override {

@@ -137,16 +136,16 @@ class Observer : public ProvidedFileSystemObserver {

base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, callback);

}

- virtual void OnObservedEntryTagUpdated(

+ virtual void OnWatcherTagUpdated(

const ProvidedFileSystemInfo& file_system_info,

- const ObservedEntry& observed_entry) override {

+ const Watcher& watcher) override {

EXPECT_EQ(kFileSystemId, file_system_info.file_system_id());

++tag_updated_counter_;

}

- virtual void OnObservedEntryListChanged(

+ virtual void OnWatcherListChanged(

const ProvidedFileSystemInfo& file_system_info,

- const ObservedEntries& observed_entries) override {

+ const Watchers& watchers) override {

EXPECT_EQ(kFileSystemId, file_system_info.file_system_id());

++list_changed_counter_;

}

@@ -210,11 +209,11 @@ class FileSystemProviderProvidedFileSystemTest : public testing::Test {

event_router_.reset(

new FakeEventRouter(profile_.get(), provided_file_system_.get()));

event_router_->AddEventListener(extensions::api::file_system_provider::

- OnObserveDirectoryRequested::kEventName,

+ OnAddWatcherRequested::kEventName,

NULL,

kExtensionId);

event_router_->AddEventListener(extensions::api::file_system_provider::

- OnUnobserveEntryRequested::kEventName,

+ OnRemoveWatcherRequested::kEventName,

NULL,

kExtensionId);

provided_file_system_->SetEventRouterForTesting(event_router_.get());

@@ -279,7 +278,7 @@ TEST_F(FileSystemProviderProvidedFileSystemTest, AutoUpdater_CallbackIgnored) {

EXPECT_EQ(0u, log.size());

}

-TEST_F(FileSystemProviderProvidedFileSystemTest, ObserveDirectory_NotFound) {

+TEST_F(FileSystemProviderProvidedFileSystemTest, AddWatcher_NotFound) {

Log log;

Observer observer;

@@ -288,7 +287,7 @@ TEST_F(FileSystemProviderProvidedFileSystemTest, ObserveDirectory_NotFound) {

// First, set the extension response to an error.

event_router_->set_reply_result(base::File::FILE_ERROR_NOT_FOUND);

- provided_file_system_->ObserveDirectory(

+ provided_file_system_->AddWatcher(

GURL(kOrigin),

base::FilePath::FromUTF8Unsafe(kDirectoryPath),

false /* recursive */,

@@ -296,13 +295,12 @@ TEST_F(FileSystemProviderProvidedFileSystemTest, ObserveDirectory_NotFound) {

base::Bind(&LogStatus, base::Unretained(&log)));

base::RunLoop().RunUntilIdle();

- // The directory should not become observed because of an error.

+ // The directory should not become watched because of an error.

ASSERT_EQ(1u, log.size());

EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND, log[0]);

- ObservedEntries* const observed_entries =

- provided_file_system_->GetObservedEntries();

- EXPECT_EQ(0u, observed_entries->size());

+ Watchers* const watchers = provided_file_system_->GetWatchers();

+ EXPECT_EQ(0u, watchers->size());

// The observer should not be called.

EXPECT_EQ(0, observer.list_changed_counter());

@@ -311,13 +309,13 @@ TEST_F(FileSystemProviderProvidedFileSystemTest, ObserveDirectory_NotFound) {

provided_file_system_->RemoveObserver(&observer);

}

-TEST_F(FileSystemProviderProvidedFileSystemTest, ObserveDirectory) {

+TEST_F(FileSystemProviderProvidedFileSystemTest, AddWatcher) {

Log log;

Observer observer;

provided_file_system_->AddObserver(&observer);

- provided_file_system_->ObserveDirectory(

+ provided_file_system_->AddWatcher(

GURL(kOrigin),

base::FilePath::FromUTF8Unsafe(kDirectoryPath),

false /* recursive */,

@@ -330,20 +328,17 @@ TEST_F(FileSystemProviderProvidedFileSystemTest, ObserveDirectory) {

EXPECT_EQ(1, observer.list_changed_counter());

EXPECT_EQ(0, observer.tag_updated_counter());

- ObservedEntries* const observed_entries =

- provided_file_system_->GetObservedEntries();

- ASSERT_EQ(1u, observed_entries->size());

- const ObservedEntry& observed_entry = observed_entries->begin()->second;

- EXPECT_EQ(FILE_PATH_LITERAL(kDirectoryPath),

- observed_entry.entry_path.value());

- EXPECT_FALSE(observed_entry.recursive);

- EXPECT_EQ("", observed_entry.last_tag);

+ Watchers* const watchers = provided_file_system_->GetWatchers();

+ ASSERT_EQ(1u, watchers->size());

+ const Watcher& watcher = watchers->begin()->second;

+ EXPECT_EQ(FILE_PATH_LITERAL(kDirectoryPath), watcher.entry_path.value());

+ EXPECT_FALSE(watcher.recursive);

+ EXPECT_EQ("", watcher.last_tag);

provided_file_system_->RemoveObserver(&observer);

}

-TEST_F(FileSystemProviderProvidedFileSystemTest,

- ObserveDirectory_PersistentIllegal) {

+TEST_F(FileSystemProviderProvidedFileSystemTest, AddWatcher_PersistentIllegal) {

Log log;

Observer observer;

@@ -365,7 +360,7 @@ TEST_F(FileSystemProviderProvidedFileSystemTest,

simple_provided_file_system.AddObserver(&observer);

- simple_provided_file_system.ObserveDirectory(

+ simple_provided_file_system.AddWatcher(

GURL(kOrigin),

base::FilePath::FromUTF8Unsafe(kDirectoryPath),

false /* recursive */,

@@ -381,14 +376,14 @@ TEST_F(FileSystemProviderProvidedFileSystemTest,

simple_provided_file_system.RemoveObserver(&observer);

}

-TEST_F(FileSystemProviderProvidedFileSystemTest, ObserveDirectory_Exists) {

+TEST_F(FileSystemProviderProvidedFileSystemTest, AddWatcher_Exists) {

Observer observer;

provided_file_system_->AddObserver(&observer);

{

- // First observe a directory not recursively.

+ // First watch a directory not recursively.

Log log;

- provided_file_system_->ObserveDirectory(

+ provided_file_system_->AddWatcher(

GURL(kOrigin),

base::FilePath::FromUTF8Unsafe(kDirectoryPath),

false /* recursive */,

@@ -401,19 +396,18 @@ TEST_F(FileSystemProviderProvidedFileSystemTest, ObserveDirectory_Exists) {

EXPECT_EQ(1, observer.list_changed_counter());

EXPECT_EQ(0, observer.tag_updated_counter());

- ObservedEntries* const observed_entries =

- provided_file_system_->GetObservedEntries();

- ASSERT_TRUE(observed_entries);

- ASSERT_EQ(1u, observed_entries->size());

- const auto& observed_entry_it = observed_entries->find(

- ObservedEntryKey(base::FilePath(FILE_PATH_LITERAL(kDirectoryPath)),

- false /* recursive */));

- ASSERT_NE(observed_entries->end(), observed_entry_it);

+ Watchers* const watchers = provided_file_system_->GetWatchers();

+ ASSERT_TRUE(watchers);

+ ASSERT_EQ(1u, watchers->size());

+ const auto& watcher_it = watchers->find(

+ WatcherKey(base::FilePath(FILE_PATH_LITERAL(kDirectoryPath)),

+ false /* recursive */));

+ ASSERT_NE(watchers->end(), watcher_it);

- EXPECT_EQ(1u, observed_entry_it->second.subscribers.size());

+ EXPECT_EQ(1u, watcher_it->second.subscribers.size());

const auto& subscriber_it =

- observed_entry_it->second.subscribers.find(GURL(kOrigin));

- ASSERT_NE(observed_entry_it->second.subscribers.end(), subscriber_it);

+ watcher_it->second.subscribers.find(GURL(kOrigin));

+ ASSERT_NE(watcher_it->second.subscribers.end(), subscriber_it);

EXPECT_EQ(kOrigin, subscriber_it->second.origin.spec());

EXPECT_TRUE(subscriber_it->second.persistent);

}

@@ -421,7 +415,7 @@ TEST_F(FileSystemProviderProvidedFileSystemTest, ObserveDirectory_Exists) {

{

// Create another non-recursive observer. That should fail.

Log log;

- provided_file_system_->ObserveDirectory(

+ provided_file_system_->AddWatcher(

GURL(kOrigin),

base::FilePath::FromUTF8Unsafe(kDirectoryPath),

false /* recursive */,

@@ -438,7 +432,7 @@ TEST_F(FileSystemProviderProvidedFileSystemTest, ObserveDirectory_Exists) {

{

// Lastly, create another recursive observer. That should succeed.

Log log;

- provided_file_system_->ObserveDirectory(

+ provided_file_system_->AddWatcher(

GURL(kOrigin),

base::FilePath::FromUTF8Unsafe(kDirectoryPath),

true /* recursive */,

@@ -455,15 +449,14 @@ TEST_F(FileSystemProviderProvidedFileSystemTest, ObserveDirectory_Exists) {

provided_file_system_->RemoveObserver(&observer);

}

-TEST_F(FileSystemProviderProvidedFileSystemTest,

- ObserveDirectory_MultipleOrigins) {

+TEST_F(FileSystemProviderProvidedFileSystemTest, AddWatcher_MultipleOrigins) {

Observer observer;

provided_file_system_->AddObserver(&observer);

{

- // First observe a directory not recursively.

+ // First watch a directory not recursively.

Log log;

- provided_file_system_->ObserveDirectory(

+ provided_file_system_->AddWatcher(

GURL(kOrigin),

base::FilePath::FromUTF8Unsafe(kDirectoryPath),

false /* recursive */,

@@ -476,28 +469,27 @@ TEST_F(FileSystemProviderProvidedFileSystemTest,

EXPECT_EQ(1, observer.list_changed_counter());

EXPECT_EQ(0, observer.tag_updated_counter());

- ObservedEntries* const observed_entries =

- provided_file_system_->GetObservedEntries();

- ASSERT_TRUE(observed_entries);

- ASSERT_EQ(1u, observed_entries->size());

- const auto& observed_entry_it = observed_entries->find(

- ObservedEntryKey(base::FilePath(FILE_PATH_LITERAL(kDirectoryPath)),

- false /* recursive */));

- ASSERT_NE(observed_entries->end(), observed_entry_it);

+ Watchers* const watchers = provided_file_system_->GetWatchers();

+ ASSERT_TRUE(watchers);

+ ASSERT_EQ(1u, watchers->size());

+ const auto& watcher_it = watchers->find(

+ WatcherKey(base::FilePath(FILE_PATH_LITERAL(kDirectoryPath)),

+ false /* recursive */));

+ ASSERT_NE(watchers->end(), watcher_it);

- EXPECT_EQ(1u, observed_entry_it->second.subscribers.size());

+ EXPECT_EQ(1u, watcher_it->second.subscribers.size());

const auto& subscriber_it =

- observed_entry_it->second.subscribers.find(GURL(kOrigin));

- ASSERT_NE(observed_entry_it->second.subscribers.end(), subscriber_it);

+ watcher_it->second.subscribers.find(GURL(kOrigin));

+ ASSERT_NE(watcher_it->second.subscribers.end(), subscriber_it);

EXPECT_EQ(kOrigin, subscriber_it->first.spec());

EXPECT_EQ(kOrigin, subscriber_it->second.origin.spec());

EXPECT_FALSE(subscriber_it->second.persistent);

}

{

- // Create another observer, but recursive and with a different origin.

+ // Create another watcher, but recursive and with a different origin.

Log log;

- provided_file_system_->ObserveDirectory(

+ provided_file_system_->AddWatcher(

GURL(kAnotherOrigin),

base::FilePath::FromUTF8Unsafe(kDirectoryPath),

true /* recursive */,

@@ -510,28 +502,27 @@ TEST_F(FileSystemProviderProvidedFileSystemTest,

EXPECT_EQ(2, observer.list_changed_counter());

EXPECT_EQ(0, observer.tag_updated_counter());

- ObservedEntries* const observed_entries =

- provided_file_system_->GetObservedEntries();

- ASSERT_TRUE(observed_entries);

- ASSERT_EQ(2u, observed_entries->size());

- const auto& observed_entry_it = observed_entries->find(

- ObservedEntryKey(base::FilePath(FILE_PATH_LITERAL(kDirectoryPath)),

- false /* recursive */));

- ASSERT_NE(observed_entries->end(), observed_entry_it);

+ Watchers* const watchers = provided_file_system_->GetWatchers();

+ ASSERT_TRUE(watchers);

+ ASSERT_EQ(2u, watchers->size());

+ const auto& watcher_it = watchers->find(

+ WatcherKey(base::FilePath(FILE_PATH_LITERAL(kDirectoryPath)),

+ false /* recursive */));

+ ASSERT_NE(watchers->end(), watcher_it);

- EXPECT_EQ(1u, observed_entry_it->second.subscribers.size());

+ EXPECT_EQ(1u, watcher_it->second.subscribers.size());

const auto& subscriber_it =

- observed_entry_it->second.subscribers.find(GURL(kOrigin));

- ASSERT_NE(observed_entry_it->second.subscribers.end(), subscriber_it);

+ watcher_it->second.subscribers.find(GURL(kOrigin));

+ ASSERT_NE(watcher_it->second.subscribers.end(), subscriber_it);

EXPECT_EQ(kOrigin, subscriber_it->first.spec());

EXPECT_EQ(kOrigin, subscriber_it->second.origin.spec());

EXPECT_FALSE(subscriber_it->second.persistent);

}

{

- // Unobserve the second one gracefully.

+ // Remove the second watcher gracefully.

Log log;

- provided_file_system_->UnobserveEntry(

+ provided_file_system_->RemoveWatcher(

GURL(kAnotherOrigin),

base::FilePath::FromUTF8Unsafe(kDirectoryPath),

true /* recursive */,

@@ -543,19 +534,18 @@ TEST_F(FileSystemProviderProvidedFileSystemTest,

EXPECT_EQ(3, observer.list_changed_counter());

EXPECT_EQ(0, observer.tag_updated_counter());

- ObservedEntries* const observed_entries =

- provided_file_system_->GetObservedEntries();

- ASSERT_TRUE(observed_entries);

- EXPECT_EQ(1u, observed_entries->size());

- const auto& observed_entry_it = observed_entries->find(

- ObservedEntryKey(base::FilePath(FILE_PATH_LITERAL(kDirectoryPath)),

- false /* recursive */));

- ASSERT_NE(observed_entries->end(), observed_entry_it);

+ Watchers* const watchers = provided_file_system_->GetWatchers();

+ ASSERT_TRUE(watchers);

+ EXPECT_EQ(1u, watchers->size());

+ const auto& watcher_it = watchers->find(

+ WatcherKey(base::FilePath(FILE_PATH_LITERAL(kDirectoryPath)),

+ false /* recursive */));

+ ASSERT_NE(watchers->end(), watcher_it);

- EXPECT_EQ(1u, observed_entry_it->second.subscribers.size());

+ EXPECT_EQ(1u, watcher_it->second.subscribers.size());

const auto& subscriber_it =

- observed_entry_it->second.subscribers.find(GURL(kOrigin));

- ASSERT_NE(observed_entry_it->second.subscribers.end(), subscriber_it);

+ watcher_it->second.subscribers.find(GURL(kOrigin));

+ ASSERT_NE(watcher_it->second.subscribers.end(), subscriber_it);

EXPECT_EQ(kOrigin, subscriber_it->first.spec());

EXPECT_EQ(kOrigin, subscriber_it->second.origin.spec());

EXPECT_FALSE(subscriber_it->second.persistent);

@@ -564,15 +554,15 @@ TEST_F(FileSystemProviderProvidedFileSystemTest,

provided_file_system_->RemoveObserver(&observer);

}

-TEST_F(FileSystemProviderProvidedFileSystemTest, UnobserveEntry) {

+TEST_F(FileSystemProviderProvidedFileSystemTest, RemoveWatcher) {

Observer observer;

provided_file_system_->AddObserver(&observer);

{

- // First, confirm that unobserving an entry which is not observed, results

- // in an error.

+ // First, confirm that removing a watcher which does not exist results in an

+ // error.

Log log;

- provided_file_system_->UnobserveEntry(

+ provided_file_system_->RemoveWatcher(

GURL(kOrigin),

base::FilePath::FromUTF8Unsafe(kDirectoryPath),

false /* recursive */,

@@ -586,9 +576,9 @@ TEST_F(FileSystemProviderProvidedFileSystemTest, UnobserveEntry) {

}

{

- // Observe a directory not recursively.

+ // Watch a directory not recursively.

Log log;

- provided_file_system_->ObserveDirectory(

+ provided_file_system_->AddWatcher(

GURL(kOrigin),

base::FilePath::FromUTF8Unsafe(kDirectoryPath),

false /* recursive */,

@@ -601,15 +591,14 @@ TEST_F(FileSystemProviderProvidedFileSystemTest, UnobserveEntry) {

EXPECT_EQ(1, observer.list_changed_counter());

EXPECT_EQ(0, observer.tag_updated_counter());

- ObservedEntries* const observed_entries =

- provided_file_system_->GetObservedEntries();

- EXPECT_EQ(1u, observed_entries->size());

+ Watchers* const watchers = provided_file_system_->GetWatchers();

+ EXPECT_EQ(1u, watchers->size());

}

{

- // Unobserve it gracefully.

+ // Remove a watcher gracefully.

Log log;

- provided_file_system_->UnobserveEntry(

+ provided_file_system_->RemoveWatcher(

GURL(kOrigin),

base::FilePath::FromUTF8Unsafe(kDirectoryPath),

false /* recursive */,

@@ -621,15 +610,14 @@ TEST_F(FileSystemProviderProvidedFileSystemTest, UnobserveEntry) {

EXPECT_EQ(2, observer.list_changed_counter());

EXPECT_EQ(0, observer.tag_updated_counter());

- ObservedEntries* const observed_entries =

- provided_file_system_->GetObservedEntries();

- EXPECT_EQ(0u, observed_entries->size());

+ Watchers* const watchers = provided_file_system_->GetWatchers();

+ EXPECT_EQ(0u, watchers->size());

}

{

- // Confirm that it's possible to observe it again.

+ // Confirm that it's possible to watch it again.

Log log;

- provided_file_system_->ObserveDirectory(

+ provided_file_system_->AddWatcher(

GURL(kOrigin),

base::FilePath::FromUTF8Unsafe(kDirectoryPath),

false /* recursive */,

@@ -642,19 +630,17 @@ TEST_F(FileSystemProviderProvidedFileSystemTest, UnobserveEntry) {

EXPECT_EQ(3, observer.list_changed_counter());

EXPECT_EQ(0, observer.tag_updated_counter());

- ObservedEntries* const observed_entries =

- provided_file_system_->GetObservedEntries();

- EXPECT_EQ(1u, observed_entries->size());

+ Watchers* const watchers = provided_file_system_->GetWatchers();

+ EXPECT_EQ(1u, watchers->size());

}

{

- // Finally, unobserve it, but with an error from extension. That should

- // result in a removed observer, anyway. The error code should not be

- // passed.

+ // Finally, remove it, but with an error from extension. That should result

+ // in a removed watcher, anyway. The error code should not be passed.

event_router_->set_reply_result(base::File::FILE_ERROR_FAILED);

Log log;

- provided_file_system_->UnobserveEntry(

+ provided_file_system_->RemoveWatcher(

GURL(kOrigin),

base::FilePath::FromUTF8Unsafe(kDirectoryPath),

false /* recursive */,

@@ -666,9 +652,8 @@ TEST_F(FileSystemProviderProvidedFileSystemTest, UnobserveEntry) {

EXPECT_EQ(4, observer.list_changed_counter());

EXPECT_EQ(0, observer.tag_updated_counter());

- ObservedEntries* const observed_entries =

- provided_file_system_->GetObservedEntries();

- EXPECT_EQ(0u, observed_entries->size());

+ Watchers* const watchers = provided_file_system_->GetWatchers();

+ EXPECT_EQ(0u, watchers->size());

}

provided_file_system_->RemoveObserver(&observer);

@@ -679,9 +664,9 @@ TEST_F(FileSystemProviderProvidedFileSystemTest, Notify) {

provided_file_system_->AddObserver(&observer);

{

- // Observe a directory.

+ // Watch a directory.

Log log;

- provided_file_system_->ObserveDirectory(

+ provided_file_system_->AddWatcher(

GURL(kOrigin),

base::FilePath::FromUTF8Unsafe(kDirectoryPath),

false /* recursive */,

@@ -694,11 +679,10 @@ TEST_F(FileSystemProviderProvidedFileSystemTest, Notify) {

EXPECT_EQ(1, observer.list_changed_counter());

EXPECT_EQ(0, observer.tag_updated_counter());

- ObservedEntries* const observed_entries =

- provided_file_system_->GetObservedEntries();

- EXPECT_EQ(1u, observed_entries->size());

- provided_file_system_->GetObservedEntries();

- EXPECT_EQ("", observed_entries->begin()->second.last_tag);

+ Watchers* const watchers = provided_file_system_->GetWatchers();

+ EXPECT_EQ(1u, watchers->size());

+ provided_file_system_->GetWatchers();

+ EXPECT_EQ("", watchers->begin()->second.last_tag);

}

{

@@ -722,25 +706,23 @@ TEST_F(FileSystemProviderProvidedFileSystemTest, Notify) {

// The tag should not be updated in advance, before all observers handle

// the notification.

- ObservedEntries* const observed_entries =

- provided_file_system_->GetObservedEntries();

- EXPECT_EQ(1u, observed_entries->size());

- provided_file_system_->GetObservedEntries();

- EXPECT_EQ("", observed_entries->begin()->second.last_tag);

+ Watchers* const watchers = provided_file_system_->GetWatchers();

+ EXPECT_EQ(1u, watchers->size());

+ provided_file_system_->GetWatchers();

+ EXPECT_EQ("", watchers->begin()->second.last_tag);

// Wait until all observers finish handling the notification.

base::RunLoop().RunUntilIdle();

- // Confirm, that the entry is still being observed, and that the tag is

- // updated.

- ASSERT_EQ(1u, observed_entries->size());

- EXPECT_EQ(tag, observed_entries->begin()->second.last_tag);

+ // Confirm, that the watcher still exists, and that the tag is updated.

+ ASSERT_EQ(1u, watchers->size());

+ EXPECT_EQ(tag, watchers->begin()->second.last_tag);

EXPECT_EQ(1, observer.list_changed_counter());

EXPECT_EQ(1, observer.tag_updated_counter());

}

{

- // Notify about deleting of the observed entry.

+ // Notify about deleting of the watched entry.

const ProvidedFileSystemObserver::ChangeType change_type =

ProvidedFileSystemObserver::DELETED;

const ProvidedFileSystemObserver::Changes changes;

@@ -761,11 +743,10 @@ TEST_F(FileSystemProviderProvidedFileSystemTest, Notify) {

EXPECT_EQ(0u, change_event->changes().size());

}

- // Confirm, that the entry is not observed anymore.

+ // Confirm, that the watcher is removed.

{

- ObservedEntries* const observed_entries =

- provided_file_system_->GetObservedEntries();

- EXPECT_EQ(0u, observed_entries->size());

+ Watchers* const watchers = provided_file_system_->GetWatchers();

+ EXPECT_EQ(0u, watchers->size());

EXPECT_EQ(2, observer.list_changed_counter());

EXPECT_EQ(2, observer.tag_updated_counter());

}