Move chrome/browser/manifest to content/browser.

content/browser/manifest/manifest_icon_selector_unittest.cc

 // Copyright 2015 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/manifest/manifest_icon_selector.h"
+#include "content/public/browser/manifest_icon_selector.h"
 
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

[please use gerrit instead, 2017/06/12 23:57:22]

namespace content { --- should be here.

[zino, 2017/06/13 16:07:45]

Done.

 using IconPurpose = content::Manifest::Icon::IconPurpose;
 
 namespace {
 
 const int kIdealIconSize = 144;
 const int kMinimumIconSize = 0;
 
 static content::Manifest::Icon CreateIcon(const std::string& url,
                                           const std::string& type,
                                           const std::vector<gfx::Size> sizes,
                                           IconPurpose purpose) {
   content::Manifest::Icon icon;
   icon.src = GURL(url);
   icon.type = base::UTF8ToUTF16(type);
   icon.sizes = sizes;
   icon.purpose.push_back(purpose);
 
   return icon;
 }
 
 }  // anonymous namespace
 
+namespace content {
+
 TEST(ManifestIconSelector, NoIcons) {
   // No icons should return the empty URL.
   std::vector<content::Manifest::Icon> icons;
   GURL url = ManifestIconSelector::FindBestMatchingIcon(
       icons, kIdealIconSize, kMinimumIconSize, IconPurpose::ANY);
   EXPECT_TRUE(url.is_empty());
 }
 
 TEST(ManifestIconSelector, NoSizes) {
   // Icon with no sizes are ignored.
@@ skipping 53 matching lines @@
   std::vector<gfx::Size> sizes_48;
   sizes_48.push_back(gfx::Size(48, 48));
 
   std::vector<gfx::Size> sizes_96;
   sizes_96.push_back(gfx::Size(96, 96));
 
   std::vector<gfx::Size> sizes_144;
   sizes_144.push_back(gfx::Size(144, 144));
 
   std::vector<content::Manifest::Icon> icons;
-  icons.push_back(
-      CreateIcon("http://foo.com/icon_48.png", "", sizes_48, IconPurpose::BADGE));
+  icons.push_back(CreateIcon("http://foo.com/icon_48.png", "", sizes_48,
+                             IconPurpose::BADGE));
   icons.push_back(
       CreateIcon("http://foo.com/icon_96.png", "", sizes_96, IconPurpose::ANY));
   icons.push_back(CreateIcon("http://foo.com/icon_144.png", "", sizes_144,
                              IconPurpose::ANY));
 
   GURL url = ManifestIconSelector::FindBestMatchingIcon(
       icons, 48, kMinimumIconSize, IconPurpose::BADGE);
   EXPECT_EQ("http://foo.com/icon_48.png", url.spec());
 
-  url = ManifestIconSelector::FindBestMatchingIcon(
-      icons, 48, kMinimumIconSize, IconPurpose::ANY);
+  url = ManifestIconSelector::FindBestMatchingIcon(icons, 48, kMinimumIconSize,
+                                                   IconPurpose::ANY);
   EXPECT_EQ("http://foo.com/icon_96.png", url.spec());
 
   url = ManifestIconSelector::FindBestMatchingIcon(icons, 96, kMinimumIconSize,
                                                    IconPurpose::BADGE);
   EXPECT_EQ("http://foo.com/icon_48.png", url.spec());
 
   url = ManifestIconSelector::FindBestMatchingIcon(icons, 96, 96,
                                                    IconPurpose::BADGE);
   EXPECT_TRUE(url.is_empty());
 
@@ skipping 354 matching lines @@
     icons.push_back(
         CreateIcon("http://foo.com/icon_no2.png", "", sizes, IconPurpose::ANY));
     icons.push_back(
         CreateIcon("http://foo.com/icon.png", "", sizes, IconPurpose::ANY));
 
     GURL url = ManifestIconSelector::FindBestMatchingIcon(
         icons, kIdealIconSize * 3, kMinimumIconSize, IconPurpose::ANY);
     EXPECT_EQ("http://foo.com/icon.png", url.spec());
   }
 }
+}

[please use gerrit instead, 2017/06/12 23:57:22]

newline above.

// namespace content

[zino, 2017/06/13 16:07:45]

Done.