chrome/browser/extensions/api/storage/settings_sync_unittest.cc - Issue 11747025: Run the JSON Schema Compiler's bundle compilation on JSON files. Previously it

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: chrome/browser/extensions/api/storage/settings_sync_unittest.cc

Issue 11747025: Run the JSON Schema Compiler's bundle compilation on JSON files. Previously it (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix ms release build Created 7 years, 11 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/extensions/api/storage/settings_sync_processor.cc ('k') | chrome/browser/extensions/api/storage/settings_sync_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/storage/settings_sync_unittest.cc

diff --git a/chrome/browser/extensions/settings/settings_sync_unittest.cc b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc

similarity index 99%

rename from chrome/browser/extensions/settings/settings_sync_unittest.cc

rename to chrome/browser/extensions/api/storage/settings_sync_unittest.cc

index 1386244d427f8e9de2784d4e54986b704b88f70c..f8d65f0da6812131f53ec2fc85062864bd141090 100644

--- a/chrome/browser/extensions/settings/settings_sync_unittest.cc

+++ b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc

@@ -2,27 +2,26 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

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

#include "base/bind.h"

#include "base/files/scoped_temp_dir.h"

#include "base/json/json_reader.h"

#include "base/json/json_writer.h"

#include "base/memory/scoped_ptr.h"

#include "base/message_loop.h"

+#include "chrome/browser/extensions/api/storage/leveldb_settings_storage_factory.h"

+#include "chrome/browser/extensions/api/storage/settings_frontend.h"

+#include "chrome/browser/extensions/api/storage/settings_storage_factory.h"

+#include "chrome/browser/extensions/api/storage/settings_sync_util.h"

+#include "chrome/browser/extensions/api/storage/settings_test_util.h"

+#include "chrome/browser/extensions/api/storage/syncable_settings_storage.h"

#include "chrome/browser/extensions/extension_system.h"

-#include "chrome/browser/extensions/settings/leveldb_settings_storage_factory.h"

-#include "chrome/browser/extensions/settings/settings_frontend.h"

-#include "chrome/browser/extensions/settings/settings_storage_factory.h"

-#include "chrome/browser/extensions/settings/settings_sync_util.h"

-#include "chrome/browser/extensions/settings/settings_test_util.h"

-#include "chrome/browser/extensions/settings/syncable_settings_storage.h"

#include "chrome/browser/extensions/test_extension_service.h"

#include "chrome/browser/value_store/testing_value_store.h"

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

#include "sync/api/sync_change_processor.h"

#include "sync/api/sync_error_factory.h"

#include "sync/api/sync_error_factory_mock.h"

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

using content::BrowserThread;