[jumbo] interface is a Windows API macro so avoid that name

interface is macro for struct in some Windows headers which
causes problems when Windows headers get exposed to code that
has named variables or functions interface. This happened
with the newly added jumbo support in chrome/browser/extensions.

Bug: 850484
Change-Id: I5d838bad5658bfe97542b32647e182348f63c4cc
Reviewed-on: https://chromium-review.googlesource.com/1106339Reviewed-by: Ken Rockot <rockot@chromium.org>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#568492}

chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.cc

@@ -33,8 +33,8 @@ class ImageWriterUtilityClient::RemovableStorageWriterClientImpl
  public:
   RemovableStorageWriterClientImpl(
       ImageWriterUtilityClient* owner,
-      chrome::mojom::RemovableStorageWriterClientPtr* interface)
-      : binding_(this, mojo::MakeRequest(interface)),
+      chrome::mojom::RemovableStorageWriterClientPtr* interface_ptr)
+      : binding_(this, mojo::MakeRequest(interface_ptr)),
         image_writer_utility_client_(owner) {
     base::AssertBlockingAllowed();
 

chrome/browser/extensions/api/media_galleries/blob_data_source_factory.cc

@@ -13,11 +13,11 @@ namespace {
 // Media data source that reads data from a blob in browser process.
 class BlobMediaDataSource : public chrome::mojom::MediaDataSource {
  public:
-  BlobMediaDataSource(chrome::mojom::MediaDataSourcePtr* interface,
+  BlobMediaDataSource(chrome::mojom::MediaDataSourcePtr* interface_ptr,
                       content::BrowserContext* browser_context,
                       const std::string& blob_uuid,
                       BlobDataSourceFactory::MediaDataCallback callback)
-      : binding_(this, mojo::MakeRequest(interface)),
+      : binding_(this, mojo::MakeRequest(interface_ptr)),
         browser_context_(browser_context),
         blob_uuid_(blob_uuid),
         callback_(callback),

chrome/browser/extensions/api/messaging/native_messaging_host_manifest.h

@@ -37,7 +37,7 @@ class NativeMessagingHostManifest {
 
   const std::string& name() const { return name_; }
   const std::string& description() const { return description_; }
-  HostInterface interface() const { return interface_; }
+  HostInterface host_interface() const { return interface_; }
   const base::FilePath& path() const { return path_; }
   const URLPatternSet& allowed_origins() const { return allowed_origins_; }
 

chrome/browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc

@@ -82,7 +82,7 @@ TEST_F(NativeMessagingHostManifestTest, LoadValid) {
 
   EXPECT_EQ(manifest->name(), "com.chrome.test.native_host");
   EXPECT_EQ(manifest->description(), "Native Messaging Test");
-  EXPECT_EQ(manifest->interface(),
+  EXPECT_EQ(manifest->host_interface(),
             NativeMessagingHostManifest::HOST_INTERFACE_STDIO);
   EXPECT_EQ(manifest->path(), base::FilePath::FromUTF8Unsafe(kTestHostPath));
   EXPECT_TRUE(manifest->allowed_origins().MatchesSecurityOrigin(