Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5886)

Unified Diff: chrome/browser/sync/test/integration/sync_extension_helper.cc

Issue 7841007: Rename browser/sync/test/live_sync directory to browser/sync/test/integration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: "" Created 9 years, 3 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
Index: chrome/browser/sync/test/integration/sync_extension_helper.cc
diff --git a/chrome/browser/sync/test/live_sync/sync_extension_helper.cc b/chrome/browser/sync/test/integration/sync_extension_helper.cc
similarity index 97%
rename from chrome/browser/sync/test/live_sync/sync_extension_helper.cc
rename to chrome/browser/sync/test/integration/sync_extension_helper.cc
index e5de2e45683828d4eefec063574d9e58a9773331..a738ad9fae5b1cf63fad8523008c0afac3470977 100644
--- a/chrome/browser/sync/test/live_sync/sync_extension_helper.cc
+++ b/chrome/browser/sync/test/integration/sync_extension_helper.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/sync/test/live_sync/sync_extension_helper.h"
+#include "chrome/browser/sync/test/integration/sync_extension_helper.h"
#include "base/file_path.h"
#include "base/file_util.h"
@@ -13,8 +13,8 @@
#include "chrome/browser/extensions/pending_extension_manager.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/extensions/extension_constants.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
-#include "chrome/browser/sync/test/live_sync/sync_datatype_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
+#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
#include "testing/gtest/include/gtest/gtest.h"
SyncExtensionHelper::ExtensionState::ExtensionState()
@@ -46,7 +46,7 @@ std::string SyncExtensionHelper::NameToId(const std::string& name) {
return id;
}
-void SyncExtensionHelper::SetupIfNecessary(LiveSyncTest* test) {
+void SyncExtensionHelper::SetupIfNecessary(SyncTest* test) {
if (setup_completed_)
return;
« no previous file with comments | « chrome/browser/sync/test/integration/sync_extension_helper.h ('k') | chrome/browser/sync/test/integration/sync_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698