Various header and namespace cleanup for mock_itoastnotifi{cation,er}

Bug: 886957
Change-Id: I4b0e5c25f5677c43c1818668bdd9aea6eb5b871e
Reviewed-on: https://chromium-review.googlesource.com/1239414Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Commit-Queue: Xi Cheng <chengx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593390}

chrome/browser/notifications/win/mock_itoastnotification.cc

@@ -5,7 +5,6 @@
 #include "chrome/browser/notifications/win/mock_itoastnotification.h"
 
 #include <wrl/client.h>
-#include <wrl/wrappers/corewrappers.h>
 
 #include "base/strings/string_piece.h"
 #include "base/win/scoped_hstring.h"
@@ -19,7 +18,7 @@ MockIToastNotification::MockIToastNotification(const base::string16& xml,
     : xml_(xml), group_(L"Notifications"), tag_(tag) {}
 
 HRESULT MockIToastNotification::get_Content(winxml::Dom::IXmlDocument** value) {
-  mswr::ComPtr<ABI::Windows::Data::Xml::Dom::IXmlDocumentIO> xml_document_io;
+  mswr::ComPtr<winxml::Dom::IXmlDocumentIO> xml_document_io;
   base::win::ScopedHString id = base::win::ScopedHString::Create(
       RuntimeClass_Windows_Data_Xml_Dom_XmlDocument);
   HRESULT hr = Windows::Foundation::ActivateInstance(
@@ -36,8 +35,7 @@ HRESULT MockIToastNotification::get_Content(winxml::Dom::IXmlDocument** value) {
     return hr;
   }
 
-  Microsoft::WRL::ComPtr<ABI::Windows::Data::Xml::Dom::IXmlDocument>
-      xml_document;
+  Microsoft::WRL::ComPtr<winxml::Dom::IXmlDocument> xml_document;
   hr = xml_document_io.CopyTo(xml_document.GetAddressOf());
   if (FAILED(hr)) {
     LOG(ERROR) << "Unable to copy to XMLDoc " << hr;

chrome/browser/notifications/win/mock_itoastnotification.h

@@ -6,7 +6,6 @@
 #define CHROME_BROWSER_NOTIFICATIONS_WIN_MOCK_ITOASTNOTIFICATION_H_
 
 #include <windows.ui.notifications.h>
-
 #include <wrl/implements.h>
 
 #include "base/macros.h"

chrome/browser/notifications/win/mock_itoastnotifier.h

@@ -6,7 +6,6 @@
 #define CHROME_BROWSER_NOTIFICATIONS_WIN_MOCK_ITOASTNOTIFIER_H_
 
 #include <windows.ui.notifications.h>
-
 #include <wrl/implements.h>
 
 #include "base/callback.h"