Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources.

chrome/browser/history/chrome_history_client.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/history/chrome_history_client.h"
 
 #include "base/logging.h"
 #include "chrome/browser/ui/profile_error_dialog.h"
 #include "chrome/common/chrome_version_info.h"
+#include "chrome/grit/chromium_strings.h"
+#include "chrome/grit/generated_resources.h"
 #include "components/bookmarks/browser/bookmark_model.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
 
 ChromeHistoryClient::ChromeHistoryClient(BookmarkModel* bookmark_model)
     : bookmark_model_(bookmark_model) {
   DCHECK(bookmark_model_);
 }
 
 void ChromeHistoryClient::BlockUntilBookmarksLoaded() {
   bookmark_model_->BlockTillLoaded();
 }
 
@@ skipping 35 matching lines @@
 void ChromeHistoryClient::Shutdown() {
   // It's possible that bookmarks haven't loaded and history is waiting for
   // bookmarks to complete loading. In such a situation history can't shutdown
   // (meaning if we invoked HistoryService::Cleanup now, we would deadlock). To
   // break the deadlock we tell BookmarkModel it's about to be deleted so that
   // it can release the signal history is waiting on, allowing history to
   // shutdown (HistoryService::Cleanup to complete). In such a scenario history
   // sees an incorrect view of bookmarks, but it's better than a deadlock.
   bookmark_model_->Shutdown();
 }