Carnitas: Remove chrome/browser/views, update references.

chrome/browser/extensions/extension_browsertests_misc.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "base/file_util.h"
 #include "base/ref_counted.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/extensions/autoupdate_interceptor.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/ui_test_utils.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/net_util.h"
 #include "net/test/test_server.h"
 
 #if defined(TOOLKIT_VIEWS)
-#include "chrome/browser/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
 #endif
 
 const std::string kSubscribePage = "/subscribe.html";
 const std::string kFeedPage = "files/feeds/feed.html";
 const std::string kFeedPageMultiRel = "files/feeds/feed_multi_rel.html";
 const std::string kNoFeedPage = "files/feeds/no_feed.html";
 const std::string kValidFeed0 = "files/feeds/feed_script.xml";
 const std::string kValidFeed1 = "files/feeds/feed1.xml";
 const std::string kValidFeed2 = "files/feeds/feed2.xml";
 const std::string kValidFeed3 = "files/feeds/feed3.xml";
@@ skipping 851 matching lines @@
           L"        window.chrome.app.isInstalled = false;"
           L"        return 'BAD: Should have thrown by now...';"
           L"      } catch (e) {"
           L"        return 'GOOD: Saw expected error.';"
           L"      }"
           L"    }()"
           L");",
           &result));
   EXPECT_EQ("GOOD: Saw expected error.", result);
 }