Move more vector icons to more appropriate directories.

chrome/browser/permissions/mock_permission_request.cc

 // Copyright 2014 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/permissions/mock_permission_request.h"
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/grit/theme_resources.h"
-#include "ui/gfx/vector_icons_public.h"
+#include "ui/vector_icons/vector_icons.h"
 
 MockPermissionRequest::MockPermissionRequest()
     : MockPermissionRequest("test",
                             "button",
                             "button",
                             GURL("http://www.google.com"),
                             PermissionRequestType::UNKNOWN,
                             PermissionRequestGestureType::UNKNOWN) {}
 
 MockPermissionRequest::MockPermissionRequest(
@@ skipping 34 matching lines @@
                             accept_label,
                             deny_label,
                             GURL("http://www.google.com"),
                             PermissionRequestType::UNKNOWN,
                             PermissionRequestGestureType::UNKNOWN) {}
 
 MockPermissionRequest::~MockPermissionRequest() {}
 
 PermissionRequest::IconId MockPermissionRequest::GetIconId() const {
   // Use a valid icon ID to support UI tests.
-  return gfx::VectorIconId::WARNING;
+  return ui::kWarningIcon;
 }
 
 base::string16 MockPermissionRequest::GetMessageTextFragment() const {
   return text_;
 }
 
 GURL MockPermissionRequest::GetOrigin() const {
   return origin_;
 }
 
@@ skipping 46 matching lines @@
     : granted_(false),
       cancelled_(false),
       finished_(false),
       request_type_(request_type),
       gesture_type_(gesture_type) {
   text_ = base::UTF8ToUTF16(text);
   accept_label_ = base::UTF8ToUTF16(accept_label);
   deny_label_ = base::UTF8ToUTF16(deny_label);
   origin_ = origin.GetOrigin();
 }