Save a little work when fetching the default title by only checking the name...

chrome/common/extensions/extension_unittest.cc

 // Copyright (c) 2009 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 "base/file_path.h"
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 282 matching lines @@
 #if defined(OS_WIN)
     FilePath path(StringPrintf(L"c:\\extension"));
 #else
     FilePath path(StringPrintf("/extension"));
 #endif
   Extension extension(path);
   std::string error_msg;
   scoped_ptr<ExtensionAction> action;
   DictionaryValue input;
 
-  // First try with an empty dictionary. We should get nothing back.
+  // First try with an empty dictionary.
   ASSERT_TRUE(extension.LoadExtensionActionHelper(
-      &input, &error_msg, ExtensionAction::PAGE_ACTION) == NULL);
-  ASSERT_STRNE("", error_msg.c_str());
+      &input, &error_msg, ExtensionAction::PAGE_ACTION) != NULL);
+  ASSERT_STREQ("", error_msg.c_str());
   error_msg = "";
 
   // Now try the same, but as a browser action. Ensure same results.
   ASSERT_TRUE(extension.LoadExtensionActionHelper(
-      &input, &error_msg, ExtensionAction::BROWSER_ACTION) == NULL);
-  ASSERT_STRNE("", error_msg.c_str());
+      &input, &error_msg, ExtensionAction::BROWSER_ACTION) != NULL);
+  ASSERT_STREQ("", error_msg.c_str());
   error_msg = "";
 
   // Now setup some values to use in the page action.
   const std::string id("MyExtensionActionId");
   const std::string name("MyExtensionActionName");
   std::string img1("image1.png");
   std::string img2("image2.png");
 
   // Add the dictionary for the contextual action.
   input.SetString(keys::kPageActionId, id);
   input.SetString(keys::kName, name);
   ListValue* icons = new ListValue;
   icons->Set(0, Value::CreateStringValue(img1));
   icons->Set(1, Value::CreateStringValue(img2));
   input.Set(keys::kPageActionIcons, icons);
 
   // Parse as page action and read back the values from the object.
   action.reset(extension.LoadExtensionActionHelper(
       &input, &error_msg, ExtensionAction::PAGE_ACTION));
   ASSERT_TRUE(NULL != action.get());
   ASSERT_STREQ("", error_msg.c_str());
   ASSERT_STREQ(id.c_str(), action->id().c_str());
+  // No title, so fall back to name.
   ASSERT_STREQ(name.c_str(), action->title().c_str());
   ASSERT_EQ(2u, action->icon_paths().size());
   ASSERT_STREQ(img1.c_str(), action->icon_paths()[0].c_str());
   ASSERT_STREQ(img2.c_str(), action->icon_paths()[1].c_str());
   ASSERT_EQ(ExtensionAction::PAGE_ACTION, action->type());
 
   // Now try the same, but as a browser action.
   action.reset(extension.LoadExtensionActionHelper(
       &input, &error_msg, ExtensionAction::BROWSER_ACTION));
   ASSERT_TRUE(NULL != action.get());
   ASSERT_STREQ("", error_msg.c_str());
   // Browser actions don't have an id, page actions do.
   ASSERT_STREQ("", action->id().c_str());
+  // No title, so fall back to name.
   ASSERT_STREQ(name.c_str(), action->title().c_str());
   ASSERT_EQ(2u, action->icon_paths().size());
   ASSERT_STREQ(img1.c_str(), action->icon_paths()[0].c_str());
   ASSERT_STREQ(img2.c_str(), action->icon_paths()[1].c_str());
   ASSERT_EQ(ExtensionAction::BROWSER_ACTION, action->type());
 
   // Explicitly set the same type and parse again.
   input.SetString(keys::kType, values::kPageActionTypeTab);
   action.reset(extension.LoadExtensionActionHelper(
       &input, &error_msg, ExtensionAction::BROWSER_ACTION));
@@ skipping 25 matching lines @@
   // Same test (id key), but with browser action.
   copy.reset(static_cast<DictionaryValue*>(input.DeepCopy()));
   copy->Remove(keys::kPageActionId, NULL);
   action.reset(extension.LoadExtensionActionHelper(
       copy.get(), &error_msg, ExtensionAction::BROWSER_ACTION));
   // Having no id is valid for browser actions.
   ASSERT_TRUE(NULL != action.get());
   ASSERT_STREQ("", error_msg.c_str());
   error_msg = "";
 
-  // Then remove the name key.
+  // Then remove the name key. It's optional, so no error.
   copy.reset(static_cast<DictionaryValue*>(input.DeepCopy()));
   copy->Remove(keys::kName, NULL);
   action.reset(extension.LoadExtensionActionHelper(
       copy.get(), &error_msg, ExtensionAction::PAGE_ACTION));
-  ASSERT_TRUE(NULL == action.get());
-  ASSERT_TRUE(MatchPattern(error_msg.c_str(),
-                           errors::kInvalidPageActionDefaultTitle));
+  ASSERT_TRUE(NULL != action.get());
+  ASSERT_STREQ("", action->title().c_str());
+  ASSERT_STREQ("", error_msg.c_str());
   error_msg = "";
 
   // Same test (name key), but with browser action.
   copy.reset(static_cast<DictionaryValue*>(input.DeepCopy()));
   copy->Remove(keys::kName, NULL);
   action.reset(extension.LoadExtensionActionHelper(
       copy.get(), &error_msg, ExtensionAction::BROWSER_ACTION));
-  ASSERT_TRUE(NULL == action.get());
-  ASSERT_TRUE(MatchPattern(error_msg.c_str(),
-                           errors::kInvalidPageActionDefaultTitle));
+  ASSERT_TRUE(NULL != action.get());
+  ASSERT_STREQ("", action->title().c_str());
+  ASSERT_STREQ("", error_msg.c_str());
   error_msg = "";
 
   // Then remove the icon paths key.
   copy.reset(static_cast<DictionaryValue*>(input.DeepCopy()));
   copy->Remove(keys::kPageActionIcons, NULL);
   action.reset(extension.LoadExtensionActionHelper(
       copy.get(), &error_msg, ExtensionAction::PAGE_ACTION));
   ASSERT_TRUE(NULL != action.get());
   error_msg = "";
 
-  // Same test (name key), but with browser action.
+  // Same test (icon paths key), but with browser action.
   copy.reset(static_cast<DictionaryValue*>(input.DeepCopy()));
   copy->Remove(keys::kPageActionIcons, NULL);
   action.reset(extension.LoadExtensionActionHelper(
       copy.get(), &error_msg, ExtensionAction::BROWSER_ACTION));
   ASSERT_TRUE(NULL != action.get());
 
   // Now test that we can parse the new format for page actions.
 
   // Now setup some values to use in the page action.
   const std::string kTitle("MyExtensionActionTitle");
   const std::string kIcon("image1.png");
 
   // Add the dictionary for the contextual action.
   input.Clear();
   input.SetString(keys::kPageActionDefaultTitle, kTitle);
   input.SetString(keys::kPageActionDefaultIcon, kIcon);
 
   // Parse as page action and read back the values from the object.
   action.reset(extension.LoadExtensionActionHelper(
       &input, &error_msg, ExtensionAction::PAGE_ACTION));
   ASSERT_TRUE(action.get());
   ASSERT_STREQ("", error_msg.c_str());
   ASSERT_EQ(kTitle, action->title());
   ASSERT_EQ(1u, action->icon_paths().size());
   ASSERT_EQ(kIcon, action->icon_paths()[0]);
   ASSERT_EQ(ExtensionAction::PAGE_ACTION, action->type());
+
+  // Same test, but with browser action.
+  action.reset(extension.LoadExtensionActionHelper(
+      &input, &error_msg, ExtensionAction::BROWSER_ACTION));
+  ASSERT_TRUE(action.get());
+  ASSERT_STREQ("", error_msg.c_str());
+  ASSERT_EQ(kTitle, action->title());
+  ASSERT_EQ(1u, action->icon_paths().size());
+  ASSERT_EQ(kIcon, action->icon_paths()[0]);
+  ASSERT_EQ(ExtensionAction::BROWSER_ACTION, action->type());
+
+  // Invalid title should give an error even with a valid name.
+  input.Clear();
+  input.SetInteger(keys::kPageActionDefaultTitle, 42);
+  input.SetString(keys::kName, name);
+  action.reset(extension.LoadExtensionActionHelper(
+      &input, &error_msg, ExtensionAction::PAGE_ACTION));
+  ASSERT_TRUE(NULL == action.get());
+  ASSERT_STREQ(errors::kInvalidPageActionDefaultTitle, error_msg.c_str());
+  error_msg = "";
+
+  // Invalid name should give an error only with no title.
+  input.SetString(keys::kPageActionDefaultTitle, kTitle);
+  input.SetInteger(keys::kName, 123);
+  action.reset(extension.LoadExtensionActionHelper(
+      &input, &error_msg, ExtensionAction::PAGE_ACTION));
+  ASSERT_TRUE(NULL != action.get());
+  ASSERT_EQ(kTitle, action->title());
+  ASSERT_STREQ("", error_msg.c_str());
+  error_msg = "";
+
+  input.Remove(keys::kPageActionDefaultTitle, NULL);
+  action.reset(extension.LoadExtensionActionHelper(
+      &input, &error_msg, ExtensionAction::PAGE_ACTION));
+  ASSERT_TRUE(NULL == action.get());
+  ASSERT_STREQ(errors::kInvalidPageActionName, error_msg.c_str());
+  error_msg = "";
+
+  // Same test (invalid title) for browser actions.
+  input.Clear();
+  input.SetInteger(keys::kPageActionDefaultTitle, 42);
+  input.SetString(keys::kName, name);
+  action.reset(extension.LoadExtensionActionHelper(
+      &input, &error_msg, ExtensionAction::BROWSER_ACTION));
+  ASSERT_TRUE(NULL == action.get());
+  ASSERT_STREQ(errors::kInvalidPageActionDefaultTitle, error_msg.c_str());
+  error_msg = "";
+
+  // Same tests (invalid name) for browser actions.
+  input.SetString(keys::kPageActionDefaultTitle, kTitle);
+  input.SetInteger(keys::kName, 123);
+  action.reset(extension.LoadExtensionActionHelper(
+      &input, &error_msg, ExtensionAction::BROWSER_ACTION));
+  ASSERT_TRUE(NULL != action.get());
+  ASSERT_EQ(kTitle, action->title());
+  ASSERT_STREQ("", error_msg.c_str());
+  error_msg = "";
+
+  input.Remove(keys::kPageActionDefaultTitle, NULL);
+  action.reset(extension.LoadExtensionActionHelper(
+      &input, &error_msg, ExtensionAction::BROWSER_ACTION));
+  ASSERT_TRUE(NULL == action.get());
+  ASSERT_STREQ(errors::kInvalidPageActionName, error_msg.c_str());
+  error_msg = "";
 }
 
 TEST(ExtensionTest, IdIsValid) {
   EXPECT_TRUE(Extension::IdIsValid("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"));
   EXPECT_TRUE(Extension::IdIsValid("pppppppppppppppppppppppppppppppp"));
   EXPECT_TRUE(Extension::IdIsValid("abcdefghijklmnopabcdefghijklmnop"));
   EXPECT_TRUE(Extension::IdIsValid("ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOP"));
   EXPECT_FALSE(Extension::IdIsValid("abcdefghijklmnopabcdefghijklmno"));
   EXPECT_FALSE(Extension::IdIsValid("abcdefghijklmnopabcdefghijklmnopa"));
   EXPECT_FALSE(Extension::IdIsValid("0123456789abcdef0123456789abcdef"));
@@ skipping 235 matching lines @@
     scoped_ptr<Extension> new_extension(
         LoadManifest("allow_silent_upgrade",
                      std::string(kTests[i].base_name) + "_new.json"));
 
     EXPECT_EQ(kTests[i].expect_success,
               Extension::IsPrivilegeIncrease(old_extension.get(),
                                              new_extension.get()))
         << kTests[i].base_name;
   }
 }