Extensions: Remove unused Warning::CreateNetworkConflictWarning.

This CL removes the unused method Warning::CreateNetworkConflictWarning. It
seems to have been introduced in r167673 without any usages.

BUG=111700

Change-Id: I4f209bbcabafd0f19203f970dab8341c97a256eb
Reviewed-on: https://chromium-review.googlesource.com/1148170Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Commit-Queue: Karan Bhatia <karandeepb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577669}

chrome/browser/extensions/warning_badge_service_unittest.cc

@@ -85,7 +85,7 @@ TEST(WarningBadgeServiceTest, SuppressBadgeForCurrentWarnings) {
   EXPECT_FALSE(HasBadge(&profile));
 
   // Set second warning and verify that it shows a badge.
-  warnings.AddWarning(Warning::CreateNetworkConflictWarning(ext2_id));
+  warnings.AddWarning(Warning::CreateRepeatedCacheFlushesWarning(ext2_id));
   EXPECT_TRUE(HasBadge(&profile));
 
   warnings.RemoveObserver(&badge_service);

extensions/browser/warning_service_unittest.cc

@@ -38,7 +38,7 @@ using WarningServiceTest = ExtensionsTest;
 const char ext1_id[] = "extension1";
 const char ext2_id[] = "extension2";
 const Warning::WarningType warning_1 = Warning::kNetworkDelay;
-const Warning::WarningType warning_2 = Warning::kNetworkConflict;
+const Warning::WarningType warning_2 = Warning::kRepeatedCacheFlushes;
 
 }  // namespace
 
@@ -80,7 +80,7 @@ TEST_F(WarningServiceTest, ClearWarnings) {
   EXPECT_CALL(observer, ExtensionWarningsChanged(affected_extensions));
   WarningSet warning_set;
   warning_set.insert(Warning::CreateNetworkDelayWarning(ext1_id));
-  warning_set.insert(Warning::CreateNetworkConflictWarning(ext2_id));
+  warning_set.insert(Warning::CreateRepeatedCacheFlushesWarning(ext2_id));
   warning_service.AddWarnings(warning_set);
   testing::Mock::VerifyAndClearExpectations(&warning_service);
 

extensions/browser/warning_set.cc

@@ -77,16 +77,6 @@ Warning Warning::CreateNetworkDelayWarning(
       message_parameters);
 }
 
-// static
-Warning Warning::CreateNetworkConflictWarning(const std::string& extension_id) {
-  std::vector<std::string> message_parameters;
-  return Warning(
-      kNetworkConflict,
-      extension_id,
-      IDS_EXTENSION_WARNINGS_NETWORK_CONFLICT,
-      message_parameters);
-}
-
 // static
 Warning Warning::CreateRedirectConflictWarning(
     const std::string& extension_id,

extensions/browser/warning_set.h

@@ -57,8 +57,6 @@ class Warning {
   // Factory methods for various warning types.
   static Warning CreateNetworkDelayWarning(
       const std::string& extension_id);
-  static Warning CreateNetworkConflictWarning(
-      const std::string& extension_id);
   static Warning CreateRedirectConflictWarning(
       const std::string& extension_id,
       const std::string& winning_extension_id,

extensions/strings/extensions_strings.grd

@@ -332,9 +332,6 @@
       <message name="IDS_EXTENSION_WARNINGS_NETWORK_DELAY" desc="Warning message indicating that an extension caused excessive network delays for web requests">
         This extension is slowing down <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>. You should disable it to restore <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>'s performance.
       </message>
-      <message name="IDS_EXTENSION_WARNINGS_NETWORK_CONFLICT" desc="Warning message which indicates that two or more extensions tried to modify a network request in a conflicting way and the modification of this extension was ignored">
-        This extension failed to modify a network request because the modification conflicted with another extension.
-      </message>
       <message name="IDS_EXTENSION_WARNINGS_REDIRECT_CONFLICT" desc="Warning message indicating that two extensions tried to redirect to different destinations">
         This extension failed to redirect a network request to <ph name="ATTEMPTED_REDIRECT_DESTINATION">$1<ex>http://www.google.com</ex></ph> because another extension (<ph name="EXTENSION_NAME">$2<ex>My Cool Extension</ex></ph>) redirected it to <ph name="ACTUAL_REDIRECT_DESTINATION">$3<ex>https://www.google.com</ex></ph>.
       </message>