diff options
| author | ericu@chromium.org <ericu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 23:09:57 +0000 |
|---|---|---|
| committer | ericu@chromium.org <ericu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 23:09:57 +0000 |
| commit | 13396b131ea36cf288946ea11cabc611acde0de6 (patch) | |
| tree | b6fe0fdb2e82a2f587846ee812d7754697d2ec60 /remoting/base/resources_unittest.cc | |
| parent | 5acc9dd5c9d077f6ffef9f7b119ed5e0bd2cf6eb (diff) | |
| download | chromium_src-13396b131ea36cf288946ea11cabc611acde0de6.zip chromium_src-13396b131ea36cf288946ea11cabc611acde0de6.tar.gz chromium_src-13396b131ea36cf288946ea11cabc611acde0de6.tar.bz2 | |
Revert 162226 - Add common_resources.grd for non-localizeable chromoting resources.
Error:
/b/build/slave/Mac/build/src/remoting/base/resources_unittest.cc:8:10: fatalerror: 'remoting/base/string_resources.h' file not found
#include "remoting/base/string_resources.h"
^
1 error generated.
The new common_resources.grd will be used for non-loalizeable resources,
such as images.
Review URL: https://chromiumcodereview.appspot.com/11087059
TBR=sergeyu@chromium.org
Review URL: https://codereview.chromium.org/11194022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162277 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/base/resources_unittest.cc')
| -rw-r--r-- | remoting/base/resources_unittest.cc | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/remoting/base/resources_unittest.cc b/remoting/base/resources_unittest.cc index aa94ec3..45f94ee 100644 --- a/remoting/base/resources_unittest.cc +++ b/remoting/base/resources_unittest.cc @@ -4,7 +4,6 @@ #include "remoting/base/resources.h" -#include "remoting/base/common_resources.h" #include "remoting/base/string_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" @@ -16,37 +15,19 @@ namespace remoting { // the test. #if !defined(OS_MACOSX) #define MAYBE_ProductName ProductName -#define MAYBE_ProductLogo ProductLogo #else // !defined(OS_MACOSX) #define MAYBE_ProductName DISABLED_ProductName -#define MAYBE_ProductLogo DISABLED_ProductLogo #endif // defined(OS_MACOSX) - -class ResourcesTest : public testing::Test { - protected: - void SetUp() OVERRIDE { - ASSERT_TRUE(LoadResources("en-US")); - } - - void TearDown() OVERRIDE { - ui::ResourceBundle::CleanupSharedInstance(); - } -}; - -TEST_F(ResourcesTest, MAYBE_ProductName) { +TEST(Resources, MAYBE_ProductName) { #if defined(GOOGLE_CHROME_BUILD) std::string expected_product_name = "Chrome Remote Desktop"; #else // defined(GOOGLE_CHROME_BUILD) std::string expected_product_name = "Chromoting"; #endif // !defined(GOOGLE_CHROME_BUILD) + ASSERT_TRUE(LoadResources("en-US")); EXPECT_EQ(expected_product_name, l10n_util::GetStringUTF8(IDR_REMOTING_PRODUCT_NAME)); -} - -TEST_F(ResourcesTest, MAYBE_ProductLogo) { - gfx::Image logo = ui::ResourceBundle::GetSharedInstance().GetImageNamed( - IDR_PRODUCT_LOGO_16); - EXPECT_FALSE(logo.IsEmpty()); + ui::ResourceBundle::CleanupSharedInstance(); } } // namespace remoting |