trunk/src/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc - Issue 13030006: Revert 190089 "Turn on SyncedNotifications for Dev, Canary, and ..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc

Issue 13030006: Revert 190089 "Turn on SyncedNotifications for Dev, Canary, and ..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 9 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:

Index: trunk/src/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc

===================================================================

--- trunk/src/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc (revision 190470)

+++ trunk/src/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc (working copy)

@@ -12,7 +12,6 @@

#include "chrome/browser/sync/profile_sync_components_factory_impl.h"

#include "chrome/browser/sync/profile_sync_service.h"

#include "chrome/common/chrome_switches.h"

-#include "chrome/common/chrome_version_info.h"

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

#include "content/public/test/test_browser_thread.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -33,7 +32,6 @@

// Returns the collection of default datatypes.

static std::vector<syncer::ModelType> DefaultDatatypes() {

- chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();

std::vector<syncer::ModelType> datatypes;

datatypes.push_back(syncer::APPS);

datatypes.push_back(syncer::APP_SETTINGS);

@@ -49,11 +47,6 @@

datatypes.push_back(syncer::PREFERENCES);

datatypes.push_back(syncer::SEARCH_ENGINES);

datatypes.push_back(syncer::SESSIONS);

- if (channel == chrome::VersionInfo::CHANNEL_UNKNOWN ||

- channel == chrome::VersionInfo::CHANNEL_DEV ||

- channel == chrome::VersionInfo::CHANNEL_CANARY) {

- datatypes.push_back(syncer::SYNCED_NOTIFICATIONS);

- }

datatypes.push_back(syncer::PROXY_TABS);

datatypes.push_back(syncer::THEMES);

datatypes.push_back(syncer::TYPED_URLS);