diff options
author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-27 20:03:32 +0000 |
---|---|---|
committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-27 20:03:32 +0000 |
commit | 9d5804f68add5c1ab7bb48be7989d798f0988375 (patch) | |
tree | 3b31ae298d7d2154337ac6622f8b361abef38f0b /chrome/browser/chromeos/customization_document_unittest.cc | |
parent | 044627eb27f28939855307d4f33cf46af33bd185 (diff) | |
download | chromium_src-9d5804f68add5c1ab7bb48be7989d798f0988375.zip chromium_src-9d5804f68add5c1ab7bb48be7989d798f0988375.tar.gz chromium_src-9d5804f68add5c1ab7bb48be7989d798f0988375.tar.bz2 |
Revert 48424 - Adding initial implementation of the PartnerCustomization classes.
BUG=chromiumos:3176
TEST=Run out/Debug/unit_tests. Run out/Debug/chrome loginmanager startupmanifest=./chrome/browser/chromeos/testdata/startup_manifest.json. There should be no asserts.
Review URL: http://codereview.chromium.org/2101021
TBR=denisromanov@chromium.org
Build error below. I don't immediately see how this CL caused the
problem, but the only other things on the blamelist are valgrind
suppressions which don't change code.
Linking...
LINK : warning LNK4224: /OPT:NOWIN98 is no longer supported; ignored
Creating library C:\b\slave\chromium-rel-builder\build\src\build\Release\lib\npchrome_frame.lib and object C:\b\slave\chromium-rel-builder\build\src\build\Release\lib\npchrome_frame.exp
chrome_tab.obj : error LNK2001: unresolved external symbol "unsigned int (__stdcall* ATL::g_pfnGetThreadACP)(void)" (?g_pfnGetThreadACP@ATL@@3P6GIXZA)
chrome_frame_ie.lib(chrome_active_document.obj) : error LNK2001: unresolved external symbol "unsigned int (__stdcall* ATL::g_pfnGetThreadACP)(void)" (?g_pfnGetThreadACP@ATL@@3P6GIXZA)
chrome_frame_npapi.lib(utils.obj) : error LNK2001: unresolved external symbol "unsigned int (__stdcall* ATL::g_pfnGetThreadACP)(void)" (?g_pfnGetThreadACP@ATL@@3P6GIXZA)
C:\b\slave\chromium-rel-builder\build\src\build\Release\servers\npchrome_frame.dll : fatal error LNK1120: 1 unresolved externals
Error executing link.exe (tool returned code: 1120)
2 build system warning(s):
- VS settings folder not found
- Interoperability reenabled
Review URL: http://codereview.chromium.org/2224008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/customization_document_unittest.cc')
-rw-r--r-- | chrome/browser/chromeos/customization_document_unittest.cc | 103 |
1 files changed, 0 insertions, 103 deletions
diff --git a/chrome/browser/chromeos/customization_document_unittest.cc b/chrome/browser/chromeos/customization_document_unittest.cc deleted file mode 100644 index c57a0c9..0000000 --- a/chrome/browser/chromeos/customization_document_unittest.cc +++ /dev/null @@ -1,103 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/chromeos/customization_document.h" - -#include "testing/gtest/include/gtest/gtest.h" - -namespace { - -const char kGoodStartupManifest[] = - "{" - " \"version\": \"1.0\"," - " \"product_sku\" : \"SKU\"," - " \"initial_locale\" : \"en_US\"," - " \"background_color\" : \"#880088\"," - " \"registration_url\" : \"http://www.google.com\"," - " \"setup_content\" : [" - " {" - " \"content_locale\" : \"en_US\"," - " \"help_page\" : \"setup_content/en_US/help.html\"," - " \"eula_page\" : \"setup_content/en_US/eula.html\"," - " }," - " {" - " \"content_locale\" : \"ru\"," - " \"help_page\" : \"setup_content/ru/help.html\"," - " \"eula_page\" : \"setup_content/ru/eula.html\"," - " }," - " ]" - "}"; - -const char kBadStartupManifest1[] = "{}"; -const char kBadStartupManifest2[] = "{ \"version\" : \"1.0\" }"; -const char kBadStartupManifest3[] = "{" - " \"version\" : \"0.0\"," - " \"product_sku\" : \"SKU\"," - "}"; - -const char kBadStartupManifest4[] = "{" - " \"version\" : \"1.0\"," - " \"product_sku\" : \"SKU\"," - " \"setup_content\" : [" - " {" - " \"help_page\" : \"setup_content/en_US/help.html\"," - " \"eula_page\" : \"setup_content/en_US/eula.html\"," - " }," - " ]" - "}"; - -const char kBadStartupManifest5[] = "{" - " \"version\" : \"1.0\"," - " \"product_sku\" : \"SKU\"," - " \"setup_content\" : [" - " {" - " \"content_locale\" : \"en_US\"," - " \"eula_page\" : \"setup_content/en_US/eula.html\"," - " }," - " ]" - "}"; - - - -} // anonymous namespace - -class StartupCustomizationDocumentTest : public testing::Test { - public: - chromeos::StartupCustomizationDocument customization_; -}; - -TEST_F(StartupCustomizationDocumentTest, LoadBadStartupManifestFromString) { - bool result = false; - result = customization_.LoadManifestFromString(kBadStartupManifest1); - EXPECT_EQ(result, false); - result = customization_.LoadManifestFromString(kBadStartupManifest2); - EXPECT_EQ(result, false); - result = customization_.LoadManifestFromString(kBadStartupManifest3); - EXPECT_EQ(result, false); - result = customization_.LoadManifestFromString(kBadStartupManifest4); - EXPECT_EQ(result, false); - result = customization_.LoadManifestFromString(kBadStartupManifest5); - EXPECT_EQ(result, false); -} - -TEST_F(StartupCustomizationDocumentTest, LoadGoodStartupManifestFromString) { - bool result = false; - result = customization_.LoadManifestFromString(kGoodStartupManifest); - EXPECT_EQ(result, true); - EXPECT_EQ(customization_.version(), "1.0"); - EXPECT_EQ(customization_.product_sku(), "SKU"); - EXPECT_EQ(customization_.initial_locale(), "en_US"); - EXPECT_EQ(customization_.background_color(), - SkColorSetRGB(0x88, 0x00, 0x88)); - EXPECT_EQ(customization_.registration_url(), "http://www.google.com"); - - EXPECT_EQ(customization_.GetSetupContent("en_US")->help_page_path, - "setup_content/en_US/help.html"); - EXPECT_EQ(customization_.GetSetupContent("en_US")->eula_page_path, - "setup_content/en_US/eula.html"); - EXPECT_EQ(customization_.GetSetupContent("ru")->help_page_path, - "setup_content/ru/help.html"); - EXPECT_EQ(customization_.GetSetupContent("ru")->eula_page_path, - "setup_content/ru/eula.html"); -} |