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

Unified Diff: chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc

Issue 420033002: ifdef a few pieces of extensions code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix clang Created 6 years, 5 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/ui/sync/profile_signin_confirmation_helper_unittest.cc
diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
index 6a5dc67acca046b36a8ab0181f0e02fdfb92aa85..2bed91c7de6cbdf4398c47f33c780e53a5553d95 100644
--- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
+++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
@@ -20,12 +20,9 @@
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
-#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/test_extension_system.h"
#include "chrome/browser/history/history_service.h"
#include "chrome/browser/history/history_service_factory.h"
#include "chrome/browser/prefs/browser_prefs.h"
-#include "chrome/common/extensions/extension_constants.h"
#include "chrome/test/base/testing_pref_service_syncable.h"
#include "chrome/test/base/testing_profile.h"
#include "components/bookmarks/browser/bookmark_model.h"
@@ -33,10 +30,6 @@
#include "components/pref_registry/pref_registry_syncable.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "content/public/test/test_utils.h"
-#include "extensions/browser/extension_prefs.h"
-#include "extensions/common/extension.h"
-#include "extensions/common/manifest_constants.h"
-#include "extensions/common/permissions/permission_set.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -46,6 +39,16 @@
#include "chrome/browser/chromeos/settings/device_settings_service.h"
#endif
+#if defined(ENABLE_EXTENSIONS)
+#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/test_extension_system.h"
+#include "chrome/common/extensions/extension_constants.h"
+#include "extensions/browser/extension_prefs.h"
+#include "extensions/common/extension.h"
+#include "extensions/common/manifest_constants.h"
+#include "extensions/common/permissions/permission_set.h"
+#endif
+
namespace {
template<typename T>
@@ -86,6 +89,7 @@ class TestingPrefStoreWithCustomReadError : public TestingPrefStore {
PrefReadError read_error_;
};
+#if defined(ENABLE_EXTENSIONS)
#if defined(OS_WIN)
const base::FilePath::CharType kExtensionFilePath[] =
FILE_PATH_LITERAL("c:\\foo");
@@ -111,6 +115,7 @@ static scoped_refptr<extensions::Extension> CreateExtension(
&error);
return extension;
}
+#endif
} // namespace
@@ -140,6 +145,7 @@ class ProfileSigninConfirmationHelperTest : public testing::Test {
model_ = BookmarkModelFactory::GetForProfile(profile_.get());
test::WaitForBookmarkModelToLoad(model_);
ASSERT_TRUE(profile_->CreateHistoryService(true, false));
+#if defined(ENABLE_EXTENSIONS)
extensions::TestExtensionSystem* system =
static_cast<extensions::TestExtensionSystem*>(
extensions::ExtensionSystem::Get(profile_.get()));
@@ -147,6 +153,7 @@ class ProfileSigninConfirmationHelperTest : public testing::Test {
system->CreateExtensionService(&command_line,
base::FilePath(kExtensionFilePath),
false);
+#endif
}
virtual void TearDown() OVERRIDE {
@@ -193,6 +200,7 @@ TEST_F(ProfileSigninConfirmationHelperTest, PromptForNewProfile_Bookmarks) {
profile_.get())));
}
+#if defined(ENABLE_EXTENSIONS)
TEST_F(ProfileSigninConfirmationHelperTest, PromptForNewProfile_Extensions) {
ExtensionService* extensions =
extensions::ExtensionSystem::Get(profile_.get())->extension_service();
@@ -217,6 +225,7 @@ TEST_F(ProfileSigninConfirmationHelperTest, PromptForNewProfile_Extensions) {
EXPECT_TRUE(GetCallbackResult(
base::Bind(&ui::CheckShouldPromptForNewProfile, profile_.get())));
}
+#endif
// http://crbug.com/393149
TEST_F(ProfileSigninConfirmationHelperTest,

Powered by Google App Engine
This is Rietveld 408576698